diff --git a/components/sandbox/tiers/src/appstudio/ns_tenant.yaml b/components/sandbox/tiers/src/appstudio/ns_tenant.yaml
index ff653a14dc6..23184fdd44e 100644
--- a/components/sandbox/tiers/src/appstudio/ns_tenant.yaml
+++ b/components/sandbox/tiers/src/appstudio/ns_tenant.yaml
@@ -120,18 +120,6 @@ objects:
   spec:
     hard:
       count/enterprisecontractpolicies.appstudio.redhat.com: "512"
-- apiVersion: v1
-  kind: ResourceQuota
-  metadata:
-    name: appstudio-crds-spi
-    namespace: ${SPACE_NAME}-tenant
-  spec:
-    hard:
-      count/spiaccesschecks.appstudio.redhat.com: "512"
-      count/spiaccesstokenbindings.appstudio.redhat.com: "512"
-      count/spiaccesstokendataupdates.appstudio.redhat.com: "512"
-      count/spiaccesstokens.appstudio.redhat.com: "512"
-      count/spifilecontentrequests.appstudio.redhat.com: "512"
 - apiVersion: v1
   kind: LimitRange
   metadata:
diff --git a/components/sandbox/tiers/src/appstudio/spacerole_admin.yaml b/components/sandbox/tiers/src/appstudio/spacerole_admin.yaml
index 42015206b0e..9b4ea445294 100644
--- a/components/sandbox/tiers/src/appstudio/spacerole_admin.yaml
+++ b/components/sandbox/tiers/src/appstudio/spacerole_admin.yaml
@@ -116,34 +116,6 @@ objects:
     - update
     - patch
     - delete
-  - apiGroups:
-    - appstudio.redhat.com
-    resources:
-    - spiaccesstokenbindings
-    - spiaccesschecks
-    - spiaccesstokens
-    - spifilecontentrequests
-    - spiaccesstokendataupdates
-    verbs:
-    - get
-    - list
-    - watch
-    - create
-    - update
-    - patch
-    - delete
-  - apiGroups:
-    - appstudio.redhat.com
-    resources:
-    - remotesecrets
-    verbs:
-    - get
-    - list
-    - watch
-    - create
-    - update
-    - patch
-    - delete
   - apiGroups:
     - ""
     resources:
diff --git a/components/sandbox/tiers/src/appstudio/spacerole_contributor.yaml b/components/sandbox/tiers/src/appstudio/spacerole_contributor.yaml
index 18e1033af42..2fa7ceb3642 100644
--- a/components/sandbox/tiers/src/appstudio/spacerole_contributor.yaml
+++ b/components/sandbox/tiers/src/appstudio/spacerole_contributor.yaml
@@ -113,25 +113,6 @@ objects:
     - get
     - list
     - watch
-  - apiGroups:
-    - appstudio.redhat.com
-    resources:
-    - spiaccesstokenbindings
-    - spiaccesschecks
-    - spiaccesstokens
-    - spifilecontentrequests
-    verbs:
-    - get
-    - list
-    - watch
-  - apiGroups:
-    - appstudio.redhat.com
-    resources:
-    - remotesecrets
-    verbs:
-    - get
-    - list
-    - watch
   - apiGroups:
     - ''
     resources:
diff --git a/components/sandbox/tiers/src/appstudio/spacerole_maintainer.yaml b/components/sandbox/tiers/src/appstudio/spacerole_maintainer.yaml
index 79c5dd03a9a..2f9f997da5e 100644
--- a/components/sandbox/tiers/src/appstudio/spacerole_maintainer.yaml
+++ b/components/sandbox/tiers/src/appstudio/spacerole_maintainer.yaml
@@ -131,29 +131,6 @@ objects:
     - create
     - update
     - patch
-  - apiGroups:
-    - appstudio.redhat.com
-    resources:
-    - spiaccesstokenbindings
-    - spiaccesschecks
-    - spiaccesstokens
-    - spifilecontentrequests
-    - spiaccesstokendataupdates
-    verbs:
-    - get
-    - list
-    - watch
-    - create
-    - update
-    - patch
-  - apiGroups:
-    - appstudio.redhat.com
-    resources:
-    - remotesecrets
-    verbs:
-    - get
-    - list
-    - watch
   - apiGroups:
     - ''
     resources:
diff --git a/components/sandbox/tiers/src/appstudio/spacerole_viewer.yaml b/components/sandbox/tiers/src/appstudio/spacerole_viewer.yaml
index 56519cb3799..a308ef745f4 100644
--- a/components/sandbox/tiers/src/appstudio/spacerole_viewer.yaml
+++ b/components/sandbox/tiers/src/appstudio/spacerole_viewer.yaml
@@ -112,25 +112,6 @@ objects:
     - get
     - list
     - watch
-  - apiGroups:
-    - appstudio.redhat.com
-    resources:
-    - spiaccesstokenbindings
-    - spiaccesschecks
-    - spiaccesstokens
-    - spifilecontentrequests
-    verbs:
-    - get
-    - list
-    - watch
-  - apiGroups:
-    - appstudio.redhat.com
-    resources:
-    - remotesecrets
-    verbs:
-    - get
-    - list
-    - watch
   - apiGroups:
     - ''
     resources:
diff --git a/hack/preview-template.env b/hack/preview-template.env
index b2f3d464979..f562995e6f7 100644
--- a/hack/preview-template.env
+++ b/hack/preview-template.env
@@ -60,35 +60,6 @@ export RELEASE_SERVICE_IMAGE_TAG=
 export RELEASE_SERVICE_PR_OWNER=
 export RELEASE_SERVICE_PR_SHA=
 
-## SPI integration
-### Based on https://github.com/konflux-ci/service-provider-integration-operator#configuration
-export SHARED_SECRET= # Random string
-export SPI_GITHUB_CLIENT_ID=
-export SPI_GITHUB_CLIENT_SECRET=
-export SPI_QUAY_CLIENT_ID=
-export SPI_QUAY_CLIENT_SECRET=
-### Change of the image
-# Operator
-export SPI_OPERATOR_IMAGE_REPO=
-export SPI_OPERATOR_IMAGE_TAG=
-export SPI_OPERATOR_PR_OWNER=
-export SPI_OPERATOR_PR_SHA=
-# Oauth
-export SPI_OAUTH_IMAGE_REPO=
-export SPI_OAUTH_IMAGE_TAG=
-export SPI_OAUTH_PR_OWNER=
-export SPI_OAUTH_PR_SHA=
-### The API server SPI should use to perform cluster requests. This should be the same as the API server
-### used by HAC.
-export SPI_API_SERVER=
-
-## Remote Secret
-### Change of the image
-export REMOTE_SECRET_IMAGE_REPO=
-export REMOTE_SECRET_IMAGE_TAG=
-export REMOTE_SECRET_PR_OWNER=
-export REMOTE_SECRET_PR_SHA=
-
 ## Application management
 ### Deploy only listed applications
 export DEPLOY_ONLY=""