diff --git a/gocd/templates/bash/deploy-py.sh b/gocd/templates/bash/deploy-py.sh
index 95ce0caf07..53da3accb3 100644
--- a/gocd/templates/bash/deploy-py.sh
+++ b/gocd/templates/bash/deploy-py.sh
@@ -8,6 +8,7 @@ IMAGE_TAG="${GO_REVISION_SNUBA_REPO}"
 && k8s-deploy \
   --label-selector="${LABEL_SELECTOR}" \
   --image="us-docker.pkg.dev/sentryio/snuba-mr/image:${IMAGE_TAG}" \
+  --container-name="snuba" \
   --container-name="api" \
   --container-name="dlq-consumer" \
   --container-name="eap-items-subscriptions-executor" \
diff --git a/gocd/templates/bash/deploy-st-py.sh b/gocd/templates/bash/deploy-st-py.sh
deleted file mode 100644
index 1734b61969..0000000000
--- a/gocd/templates/bash/deploy-st-py.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-eval $(regions-project-env-vars --region="${SENTRY_REGION}")
-
-IMAGE_TAG="${GO_REVISION_SNUBA_REPO}"
-
-/devinfra/scripts/get-cluster-credentials
-
-k8s-deploy \
-  --label-selector="${LABEL_SELECTOR}" \
-  --image="us-docker.pkg.dev/sentryio/snuba-mr/image:${IMAGE_TAG}" \
-  --container-name="snuba" \
-  --container-name="snuba-admin"
diff --git a/gocd/templates/bash/deploy-st-rs.sh b/gocd/templates/bash/deploy-st-rs.sh
deleted file mode 100644
index 4364cfa33b..0000000000
--- a/gocd/templates/bash/deploy-st-rs.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-echo "TODO fix"
-echo "This is a no-op for single-tenants. deploy-snuba-py handles everything"
-echo "(and traffic is low enough that we don't have rebalance issues)"
diff --git a/gocd/templates/bash/deploy-st.sh b/gocd/templates/bash/deploy-st.sh
deleted file mode 100644
index c5e8d9a0b5..0000000000
--- a/gocd/templates/bash/deploy-st.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-eval $(regions-project-env-vars --region="${SENTRY_REGION}")
-
-IMAGE_TAG="${GO_REVISION_SNUBA_REPO}"
-
-/devinfra/scripts/get-cluster-credentials
-
-k8s-deploy \
-  --label-selector="${LABEL_SELECTOR}" \
-  --image="us-docker.pkg.dev/sentryio/snuba-mr/image:${IMAGE_TAG}" \
-  --container-name="snuba" \
-  --container-name="snuba-admin"
-
-k8s-deploy \
-  --label-selector="${LABEL_SELECTOR}" \
-  --image="us-docker.pkg.dev/sentryio/snuba-mr/image:${IMAGE_TAG}" \
-  --type="cronjob" \
-  --container-name="cleanup"
diff --git a/gocd/templates/pipelines/snuba-py.libsonnet b/gocd/templates/pipelines/snuba-py.libsonnet
index 43b8a3bf9e..e831010084 100644
--- a/gocd/templates/pipelines/snuba-py.libsonnet
+++ b/gocd/templates/pipelines/snuba-py.libsonnet
@@ -221,10 +221,7 @@ function(region) {
               LABEL_SELECTOR: 'service=snuba',
             },
             tasks: [
-              if getsentry.is_st(region) then
-                gocdtasks.script(importstr '../bash/deploy-st-py.sh')
-              else
-                gocdtasks.script(importstr '../bash/deploy-py.sh'),
+              gocdtasks.script(importstr '../bash/deploy-py.sh'),
             ],
           },
         },
diff --git a/gocd/templates/pipelines/snuba-rs.libsonnet b/gocd/templates/pipelines/snuba-rs.libsonnet
index 61d7fcd3d7..73b2460971 100644
--- a/gocd/templates/pipelines/snuba-rs.libsonnet
+++ b/gocd/templates/pipelines/snuba-rs.libsonnet
@@ -1,4 +1,3 @@
-local getsentry = import 'github.com/getsentry/gocd-jsonnet/libs/getsentry.libsonnet';
 local gocdtasks = import 'github.com/getsentry/gocd-jsonnet/libs/gocd-tasks.libsonnet';
 
 // The return value of this function is the body of a GoCD pipeline.
@@ -202,10 +201,7 @@ function(region) {
               LABEL_SELECTOR: 'service=snuba',
             },
             tasks: [
-              if getsentry.is_st(region) then
-                gocdtasks.script(importstr '../bash/deploy-st-rs.sh')
-              else
-                gocdtasks.script(importstr '../bash/deploy-rs.sh'),
+              gocdtasks.script(importstr '../bash/deploy-rs.sh'),
             ],
           },
         },