diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 869e6be18..5f2a7dc42 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,6 +1,6 @@
 # Lines starting with '#' are comments.
 # Each line is a file pattern followed by one or more owners.
 
-.github/workflows/              @immutable/prodsec @sergerad @rzmahmood @EdwardJES @jp-imx
-.github/actions/                @immutable/prodsec @sergerad @rzmahmood @EdwardJES @jp-imx
+.github/workflows/              @immutable/prodsec @sergerad @drinkcoffee @ermyas @jp-imx @ipekt @wcgcyx
+.github/actions/                @immutable/prodsec @sergerad @drinkcoffee @ermyas @jp-imx @ipekt @wcgcyx
 ./                              @sergerad @drinkcoffee @ermyas @jp-imx @ipekt @wcgcyx
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 64dce3f90..fbaa78e4b 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -20,7 +20,7 @@ jobs:
           REPOSITORY_NAME="$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')"
           BUILD_TIMESTAMP="$(date +%s)"
           SHORT_SHA="$(git rev-parse --short HEAD)"
-          echo TAGS="ghcr.io/${{ github.repository }}/immutable-geth:develop-$BUILD_TIMESTAMP-git.$SHORT_SHA" >> $GITHUB_ENV
+          echo TAGS="ghcr.io/${{ github.repository }}/immutable-geth:unstable-$BUILD_TIMESTAMP-git.$SHORT_SHA" >> $GITHUB_ENV
 
       - uses: ./.github/actions/push
         with:
diff --git a/.github/workflows/testnet.yaml b/.github/workflows/testnet.yaml
deleted file mode 100644
index 3b853d702..000000000
--- a/.github/workflows/testnet.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Push Testnet Docker Image
-
-on:
-  workflow_dispatch:
-    inputs:
-      dev:
-        description: "Develop tag to push as testnet (e.g. develop-1736464855-git.6a0aa89)"
-        required: true
-      version:
-        description: "Testnet version to use in the new image tag (e.g. v1.0.0-beta.13)"
-        required: true
-
-jobs:
-  tag_and_push_testnet_image:
-    name: Tag and Push Testnet Image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Promote Develop image to Testnet
-        shell: bash
-        run: |
-          dev_tag="${{ inputs.dev }}"
-          dev_image="ghcr.io/${{ github.repository }}/immutable-geth:$dev_tag"
-          testnet_image="ghcr.io/${{ github.repository }}/immutable-geth:testnet-${{ inputs.version }}"
-
-          docker pull "$dev_image"
-          docker tag "$dev_image" "$testnet_image"
-          docker push "$testnet_image"