diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 795d062..5c45962 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -19,6 +19,15 @@ on:
   workflow_dispatch:
 
 jobs:
+  fail-if-unsafe:
+    runs-on: ubuntu-latest
+    if: ${{ !contains( github.event.pull_request.labels.*.name, 'safe-to-test') }}
+    steps:
+      - name: Fail if not marked as safe to test
+        run: |
+          echo "CI will not run on a PR unless it has the safe-to-test label applied"
+          exit 1
+
   lint:
     name: Lint code
     runs-on: ubuntu-latest
@@ -39,6 +48,7 @@ jobs:
   test:
     name: Tests
     runs-on: [ self-hosted, Linux ]
+    if: ${{ contains( github.event.pull_request.labels.*.name, 'safe-to-test') }}
     container:
       image: python:3.9.18
       credentials:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
deleted file mode 100644
index e316ade..0000000
--- a/.github/workflows/push.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020 Iguazio
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-name: CI-Push
-
-on: push
-
-jobs:
-  lint:
-    name: Lint code
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.8
-          cache: pip
-      - name: Install dependencies
-        run: make dev-env
-      - name: Lint
-        run: make lint
-
-  test:
-    name: Tests
-    runs-on: [ self-hosted, Linux ]
-    container:
-      image: python:3.9.18
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies
-        run: make dev-env
-      - name: Run tests
-        run: make test
-        env:
-          V3IO_API: ${{ secrets.V3IO_API }}
-          V3IO_ACCESS_KEY: ${{ secrets.V3IO_ACCESS_KEY }}