diff --git a/.github/workflows/docker-bench-security.yml b/.github/workflows/docker-bench-security.yml
index a64282a309..8b56d199e2 100644
--- a/.github/workflows/docker-bench-security.yml
+++ b/.github/workflows/docker-bench-security.yml
@@ -2,7 +2,6 @@ name: Docker Bench for Security
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/double_ws_export.yml b/.github/workflows/double_ws_export.yml
index a33aea7d64..da2304ffa8 100644
--- a/.github/workflows/double_ws_export.yml
+++ b/.github/workflows/double_ws_export.yml
@@ -5,7 +5,6 @@ name: Double workspace export
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/experimental_workflow_tests.yml b/.github/workflows/experimental_workflow_tests.yml
index 84166ab362..5f8391317d 100644
--- a/.github/workflows/experimental_workflow_tests.yml
+++ b/.github/workflows/experimental_workflow_tests.yml
@@ -2,9 +2,10 @@ name: Workflow Interface Tests
 
 on:
   push:
-    branches: [ develop ]
+    branches: 
+      - develop
+      - v1.7.x
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/gandlf.yml b/.github/workflows/gandlf.yml
index 0bd700212a..d80d8f443c 100644
--- a/.github/workflows/gandlf.yml
+++ b/.github/workflows/gandlf.yml
@@ -5,7 +5,6 @@ name: GaNDLF TaskRunner
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml
index a529491bdb..59d852e7c4 100644
--- a/.github/workflows/hadolint.yml
+++ b/.github/workflows/hadolint.yml
@@ -5,7 +5,6 @@ name: Hadolint Security Scan
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/interactive-kvasir.yml b/.github/workflows/interactive-kvasir.yml
index 93ff09126c..12b38d618f 100644
--- a/.github/workflows/interactive-kvasir.yml
+++ b/.github/workflows/interactive-kvasir.yml
@@ -5,7 +5,6 @@ name: Interactive API - Pytorch Kvasir UNet
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/interactive-tensorflow.yml b/.github/workflows/interactive-tensorflow.yml
index 110ee1b175..8ff870b09f 100644
--- a/.github/workflows/interactive-tensorflow.yml
+++ b/.github/workflows/interactive-tensorflow.yml
@@ -5,7 +5,6 @@ name: Interactive API - Tensorflow MNIST
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 1556bad3b3..36d7fdc41e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,7 +5,6 @@ name: Check code format
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/openfl-docker-build.yml b/.github/workflows/openfl-docker-build.yml
new file mode 100644
index 0000000000..ae19d6b37e
--- /dev/null
+++ b/.github/workflows/openfl-docker-build.yml
@@ -0,0 +1,47 @@
+name: Build and Push Openfl Docker Image
+
+on:
+  push:
+    branches: 
+      - develop
+      - v1.7.x
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version to tag the Docker image with'
+        required: false
+        default: 'latest'
+
+env:
+  VERSION: ${{ github.ref == 'refs/heads/develop' && 'latest' || '1.7' }}
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:      
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Log in to GitHub Container Registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build and Push OpenFL Base Image
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        file: openfl-docker/Dockerfile.base
+        push: true
+        tags: |
+          ghcr.io/${{ github.repository }}/openfl:${{ github.event.inputs.version || 'latest' }}
diff --git a/.github/workflows/pki.yml b/.github/workflows/pki.yml
index 704fbbfcea..bf907273ed 100644
--- a/.github/workflows/pki.yml
+++ b/.github/workflows/pki.yml
@@ -5,7 +5,6 @@ name: Private Key Infrastructure
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/pytest_coverage.yml b/.github/workflows/pytest_coverage.yml
index 18fa9f25fe..a5ea0c14d9 100644
--- a/.github/workflows/pytest_coverage.yml
+++ b/.github/workflows/pytest_coverage.yml
@@ -5,7 +5,6 @@ name: Pytest and code coverage
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
   workflow_dispatch:
 
diff --git a/.github/workflows/straggler-handling.yml b/.github/workflows/straggler-handling.yml
index 4f2bdb7dd1..450caf8e8a 100644
--- a/.github/workflows/straggler-handling.yml
+++ b/.github/workflows/straggler-handling.yml
@@ -5,7 +5,6 @@ name: Straggler Handling Test
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/taskrunner.yml b/.github/workflows/taskrunner.yml
index 59abb67251..a9093be4c1 100644
--- a/.github/workflows/taskrunner.yml
+++ b/.github/workflows/taskrunner.yml
@@ -5,7 +5,6 @@ name: TaskRunner
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/taskrunner_eden_pipeline.yml b/.github/workflows/taskrunner_eden_pipeline.yml
index b6d2426c46..3430f89463 100644
--- a/.github/workflows/taskrunner_eden_pipeline.yml
+++ b/.github/workflows/taskrunner_eden_pipeline.yml
@@ -5,7 +5,6 @@ name: TaskRunner (Eden Compression)
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/tr_docker_gramine_direct.yml b/.github/workflows/tr_docker_gramine_direct.yml
index d02526edb7..309351f385 100644
--- a/.github/workflows/tr_docker_gramine_direct.yml
+++ b/.github/workflows/tr_docker_gramine_direct.yml
@@ -3,7 +3,6 @@ name: TaskRunner (docker/gramine-direct)
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/tr_docker_native.yml b/.github/workflows/tr_docker_native.yml
index b3382553ae..f5af424a18 100644
--- a/.github/workflows/tr_docker_native.yml
+++ b/.github/workflows/tr_docker_native.yml
@@ -3,7 +3,6 @@ name: TaskRunner (docker/native)
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index 7c26b672d3..039e241652 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -1,9 +1,10 @@
 name: Trivy
 on:
   push:
-    branches: [ develop ]
+    branches: 
+      - develop
+      - v1.7.x
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 jobs:
   build:
diff --git a/.github/workflows/wf_functional_e2e.yml b/.github/workflows/wf_functional_e2e.yml
index c51b7acc03..923aa73bae 100644
--- a/.github/workflows/wf_functional_e2e.yml
+++ b/.github/workflows/wf_functional_e2e.yml
@@ -5,7 +5,6 @@ name: Workflow_Functional_E2E
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
     
   workflow_dispatch:
diff --git a/.github/workflows/workflow_interface_101_mnist.yml b/.github/workflows/workflow_interface_101_mnist.yml
index 8f6e5e7267..57e1dae46e 100644
--- a/.github/workflows/workflow_interface_101_mnist.yml
+++ b/.github/workflows/workflow_interface_101_mnist.yml
@@ -6,7 +6,6 @@ name: Workflow Interface 101 MNIST Notebook
 
 on:
   pull_request:
-    branches: [ develop ]
     types: [opened, synchronize, reopened, ready_for_review]
 
   workflow_dispatch: