diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a5879d44e..3670b4dce 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -16,15 +16,15 @@ name: Docker
 on:
   push:
     branches:
-      - master
-      - develop
+      - rcc
+    tags:
+      - pitschi*
 
-  pull_request:
 
 # Certain actions will only run when this is the master repo.
 env:
-  MASTER_REPO: clowder-framework/clowder
-  DOCKERHUB_ORG: clowder
+  MASTER_REPO: UQ-RCC/clowder
+  DOCKERHUB_ORG: uqrcc
 
 jobs:
   docker:
@@ -81,8 +81,8 @@ jobs:
           elif [ "$BRANCH" == "develop" ]; then
             echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
             echo "CLOWDER_TAGS=develop" >> $GITHUB_ENV
-          else
-            echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
+          else 
+            echo "CLOWDER_VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
             echo "CLOWDER_TAGS=" >> $GITHUB_ENV
           fi
 
@@ -101,27 +101,27 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
           context: ${{ matrix.FOLDER }}
-          tags: "${{ env.TAGS }}"
+          tags: ${{ env.GITHUB_BRANCH }}
           buildargs: BRANCH,VERSION,BUILDNUMBER,GITSHA1
           no_push: true
 
       # this will publish to github container registry
-      - name: Publish to GitHub
-        if: github.event_name != 'pull_request' && github.repository == env.MASTER_REPO
-        uses: elgohr/Publish-Docker-Github-Action@2.22
-        env:
-          BRANCH: ${{ env.GITHUB_BRANCH }}
-          VERSION: ${{ env.CLOWDER_VERSION }}
-          BUILDNUMBER: ${{ github.run_number }}
-          GITSHA1: ${{ github.sha  }}
-        with:
-          registry: ghcr.io
-          name: ${{ github.repository_owner }}/${{ matrix.IMAGE }}
-          username: ${{ secrets.GHCR_USERNAME }}
-          password: ${{ secrets.GHCR_PASSWORD }}
-          context: ${{ matrix.FOLDER }}
-          tags: "${{ env.CLOWDER_TAGS }}"
-          buildargs: BRANCH,VERSION,BUILDNUMBER,GITSHA1
+      #      - name: Publish to GitHub
+      #  if: github.event_name != 'pull_request' && github.repository == env.MASTER_REPO
+      #  uses: elgohr/Publish-Docker-Github-Action@2.22
+      #  env:
+      #    BRANCH: ${{ env.GITHUB_BRANCH }}
+      #    VERSION: ${{ env.CLOWDER_VERSION }}
+      #    BUILDNUMBER: ${{ github.run_number }}
+      #    GITSHA1: ${{ github.sha  }}
+      #  with:
+      #    registry: ghcr.io
+      #    name: ${{ github.repository_owner }}/${{ matrix.IMAGE }}
+      #    username: ${{ secrets.GHCR_USERNAME }}
+      #    password: ${{ secrets.GHCR_PASSWORD }}
+      #    context: ${{ matrix.FOLDER }}
+      #    tags: "${{ env.CLOWDER_TAGS }}"
+      #    buildargs: BRANCH,VERSION,BUILDNUMBER,GITSHA1
 
       # this will publish to the clowder dockerhub repo
       - name: Publish to Docker Hub
@@ -137,7 +137,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
           context: ${{ matrix.FOLDER }}
-          tags: "${{ env.CLOWDER_TAGS }}"
+          tags: ${{ env.GITHUB_BRANCH }}
           buildargs: BRANCH,VERSION,BUILDNUMBER,GITSHA1
 
       # this will update the README of the dockerhub repo