diff --git a/.github/workflows/deploy_check.yml b/.github/workflows/deploy_check.yml
index 9f295a6..ba9b28c 100755
--- a/.github/workflows/deploy_check.yml
+++ b/.github/workflows/deploy_check.yml
@@ -14,7 +14,7 @@ concurrency:
 jobs:
   deployment_check:
     name: Check Deployment
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, oracle-arm]
     steps:
       - name: Install jq
         run: sudo apt-get install -y jq
diff --git a/.github/workflows/run_foss_spec.yml b/.github/workflows/run_foss_spec.yml
index dcc6382..2b47788 100755
--- a/.github/workflows/run_foss_spec.yml
+++ b/.github/workflows/run_foss_spec.yml
@@ -33,8 +33,6 @@ jobs:
 
     env:
       POSTGRES_HOST: localhost
-      POSTGRES_PORT: ${{ 5432 + matrix.ci_node_index }}
-      REDIS_URL: redis://localhost:${{ 6379 + matrix.ci_node_index }}
       RAILS_ENV: test
 
     steps:
@@ -132,3 +130,11 @@ jobs:
         with:
           name: rails-log-folder-${{ matrix.ci_node_index }}
           path: log
+
+      - name: Stop services
+        if: always()
+        run: |
+          docker stop $PG_CONTAINER_NAME || true
+          docker rm $PG_CONTAINER_NAME || true
+          docker stop $RD_CONTAINER_NAME || true
+          docker rm $RD_CONTAINER_NAME || true