diff --git a/.github/workflows/post_integration.yml b/.github/workflows/post_integration.yml
index 492a54f0..7bd2fd66 100644
--- a/.github/workflows/post_integration.yml
+++ b/.github/workflows/post_integration.yml
@@ -31,8 +31,8 @@ jobs:
       - name: 📝 Base Variables
         id: base-variables
         run: |
-          echo ::set-output name=cardano-graphql-server-image::inputoutput/cardano-graphql
-          echo ::set-output name=cardano-graphql-hasura-image::inputoutput/cardano-graphql-hasura
+          echo ::set-output name=cardano-graphql-server-image::cardanofoundation/cardano-graphql
+          echo ::set-output name=cardano-graphql-hasura-image::cardanofoundation/cardano-graphql-hasura
 
       - name: 🔨 Build and push Cardano GraphQL Server Dockerfile (default)
         if: ${{ matrix.network == 'mainnet' }}
diff --git a/.github/workflows/post_release.yml b/.github/workflows/post_release.yml
index 326eeb89..2ecaac35 100644
--- a/.github/workflows/post_release.yml
+++ b/.github/workflows/post_release.yml
@@ -36,8 +36,8 @@ jobs:
       - name: 📝 Base Variables
         id: base-variables
         run: |
-          echo ::set-output name=cardano-graphql-server-image::inputoutput/cardano-graphql
-          echo ::set-output name=cardano-graphql-hasura-image::inputoutput/cardano-graphql-hasura
+          echo ::set-output name=cardano-graphql-server-image::cardanofoundation/cardano-graphql
+          echo ::set-output name=cardano-graphql-hasura-image::cardanofoundation/cardano-graphql-hasura
           
       - name: 🔨 Build and push Cardano GraphQL Server Dockerfile (default)
         if: ${{ matrix.network == 'mainnet' }}
@@ -65,7 +65,7 @@ jobs:
           context: ./packages/api-cardano-db-hasura/hasura
           file: ./packages/api-cardano-db-hasura/hasura/Dockerfile
           push: true
-          tags: ${{ steps.base-variables.outputs.cardano-graphql-hasura-image }}:${{ github.sha }}, inputoutput/cardano-graphql-hasura:${{ github.event.release.tag_name }}, inputoutput/cardano-graphql-hasura:latest
+          tags: ${{ steps.base-variables.outputs.cardano-graphql-hasura-image }}:${{ github.sha }}, cardanofoundation/cardano-graphql-hasura:${{ github.event.release.tag_name }}, cardanofoundation/cardano-graphql-hasura:latest
       
       - name: 📤 Publish packages to npm registry
         if: ${{ matrix.network == 'mainnet' }}