diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
index 5186b698..16460297 100644
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -22,5 +22,5 @@ assignees: ''
 - [ ] Does what I have made have appropriate test coverage?
 - [ ] Documentation and/or scientific documentation exists and can be found
 - [ ] Peer Reviewed by 2 people on the team
-- [ ] Manual testing of all PRs in Dev and Prod
+- [ ] Manual testing of all PRs in Dev and Test
 - [ ] Merged
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index c779fac8..7f60dd90 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -22,5 +22,5 @@ assignees: ''
 - [ ] Does what I have made have appropriate test coverage?
 - [ ] Documentation and/or scientific documentation exists and can be found
 - [ ] Peer Reviewed by 2 people on the team
-- [ ] Manual testing of all PRs in Dev and Prod
+- [ ] Manual testing of all PRs in Dev and Test
 - [ ] Merged
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 38291d56..459cc9a1 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -92,35 +92,3 @@ jobs:
       - name: Run integration tests
         run: BASE_URL=${{ matrix.baseUrl }} API_NAME=${{ matrix.name }} node src/main.js
 
-  deploy-prod:
-    name: Deploy (prod)
-    permissions:
-      contents: read # Required for repository access
-    needs: [integration-tests, vars]
-    uses: ./.github/workflows/.deploy.yml
-    secrets:
-      db_password: ${{ secrets.db_password }}
-      oc_namespace: ${{ secrets.OC_NAMESPACE }}
-      oc_token: ${{ secrets.OC_TOKEN }}
-    with:
-      environment: prod
-      target: prod
-      tag: ${{ github.sha }}
-
-  promote:
-    name: Promote Images
-    needs: [deploy-prod, vars]
-    runs-on: ubuntu-26.04
-    permissions:
-      packages: write
-    strategy:
-      matrix:
-        package: [backend-java, backend-py, migrations-py]
-    timeout-minutes: 1
-    steps:
-      - uses: shrink/actions-docker-registry-tag@e6aaef25c595b6e0edd18bf4c7dbfea3abd43299 # v5
-        with:
-          registry: ghcr.io
-          repository: ${{ github.repository }}/${{ matrix.package }}
-          target: ${{ github.sha }}
-          tags: prod