diff --git a/.gitea/workflows/fixturenet-eth-test.yml b/.gitea/workflows/fixturenet-eth-test.yml
index 43572c92..6b764664 100644
--- a/.gitea/workflows/fixturenet-eth-test.yml
+++ b/.gitea/workflows/fixturenet-eth-test.yml
@@ -12,7 +12,7 @@ jobs:
       - name: "Clone project repository"
         uses: actions/checkout@v3
       - name: "Install Python"
-        uses: actions/setup-python@v4
+        uses: cerc-io/setup-python@v4
         with:
           python-version: '3.8'
       - name: "Print Python version"
diff --git a/.gitea/workflows/publish.yml b/.gitea/workflows/publish.yml
index fb45c27e..c86713ce 100644
--- a/.gitea/workflows/publish.yml
+++ b/.gitea/workflows/publish.yml
@@ -19,7 +19,7 @@ jobs:
           build_tag=$(./scripts/create_build_tag_file.sh)
           echo "build-tag=v${build_tag}" >> $GITHUB_OUTPUT
       - name: "Install Python"
-        uses: actions/setup-python@v4
+        uses: cerc-io/setup-python@v4
         with:
           python-version: '3.8'
       - name: "Print Python version"
@@ -37,7 +37,7 @@ jobs:
         run: |
           cp ${{ steps.build.outputs.package-file }} ./laconic-so
       - name: "Create release"
-        uses: https://gitea.com/cerc-io/action-gh-release@gitea-v2
+        uses: cerc-io/action-gh-release@gitea-v1
         with:
           tag_name: ${{ steps.build-info.outputs.build-tag }}
           # On the publish test branch, mark our release as a draft
diff --git a/.gitea/workflows/test-deploy.yml b/.gitea/workflows/test-deploy.yml
index 5ac5b450..72b5a892 100644
--- a/.gitea/workflows/test-deploy.yml
+++ b/.gitea/workflows/test-deploy.yml
@@ -20,7 +20,7 @@ jobs:
       - name: "Clone project repository"
         uses: actions/checkout@v3
       - name: "Install Python"
-        uses: actions/setup-python@v4
+        uses: cerc-io/setup-python@v4
         with:
           python-version: '3.8'
       - name: "Print Python version"
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 303b42f4..56718e2a 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
       - name: "Clone project repository"
         uses: actions/checkout@v3
       - name: "Install Python"
-        uses: actions/setup-python@v4
+        uses: cerc-io/setup-python@v4
         with:
           python-version: '3.8'
       - name: "Print Python version"
diff --git a/app/data/compose/docker-compose-fixturenet-optimism.yml b/app/data/compose/docker-compose-fixturenet-optimism.yml
index 9d7d99dd..c5804a14 100644
--- a/app/data/compose/docker-compose-fixturenet-optimism.yml
+++ b/app/data/compose/docker-compose-fixturenet-optimism.yml
@@ -24,9 +24,9 @@ services:
       "./wait-for-it.sh -h ${CERC_L1_HOST:-$${DEFAULT_CERC_L1_HOST}} -p ${CERC_L1_PORT:-$${DEFAULT_CERC_L1_PORT}} -s -t 60 -- ./run.sh"
     volumes:
       - ../config/network/wait-for-it.sh:/app/packages/contracts-bedrock/wait-for-it.sh
-      - ../container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts:/app/packages/contracts-bedrock/tasks/verify-contract-deployment.ts
-      - ../container-build/cerc-optimism-contracts/hardhat-tasks/rekey-json.ts:/app/packages/contracts-bedrock/tasks/rekey-json.ts
-      - ../container-build/cerc-optimism-contracts/hardhat-tasks/send-balance.ts:/app/packages/contracts-bedrock/tasks/send-balance.ts
+      - ../config/optimism-contracts/hardhat-tasks/verify-contract-deployment.ts:/app/packages/contracts-bedrock/tasks/verify-contract-deployment.ts
+      - ../config/optimism-contracts/hardhat-tasks/rekey-json.ts:/app/packages/contracts-bedrock/tasks/rekey-json.ts
+      - ../config/optimism-contracts/hardhat-tasks/send-balance.ts:/app/packages/contracts-bedrock/tasks/send-balance.ts
       - ../config/fixturenet-optimism/optimism-contracts/update-config.js:/app/packages/contracts-bedrock/update-config.js
       - ../config/fixturenet-optimism/optimism-contracts/run.sh:/app/packages/contracts-bedrock/run.sh
       - l2_accounts:/l2-accounts
diff --git a/app/data/container-build/cerc-optimism-contracts/hardhat-tasks/rekey-json.ts b/app/data/config/optimism-contracts/hardhat-tasks/rekey-json.ts
similarity index 100%
rename from app/data/container-build/cerc-optimism-contracts/hardhat-tasks/rekey-json.ts
rename to app/data/config/optimism-contracts/hardhat-tasks/rekey-json.ts
diff --git a/app/data/container-build/cerc-optimism-contracts/hardhat-tasks/send-balance.ts b/app/data/config/optimism-contracts/hardhat-tasks/send-balance.ts
similarity index 100%
rename from app/data/container-build/cerc-optimism-contracts/hardhat-tasks/send-balance.ts
rename to app/data/config/optimism-contracts/hardhat-tasks/send-balance.ts
diff --git a/app/data/container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts b/app/data/config/optimism-contracts/hardhat-tasks/verify-contract-deployment.ts
similarity index 100%
rename from app/data/container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts
rename to app/data/config/optimism-contracts/hardhat-tasks/verify-contract-deployment.ts