diff --git a/.github/workflows/build-images-base.yaml b/.github/workflows/build-images-base.yaml
index 05dac9f42..ea70a6d6a 100644
--- a/.github/workflows/build-images-base.yaml
+++ b/.github/workflows/build-images-base.yaml
@@ -49,7 +49,7 @@ on:
         description: Authorino Operator bundle version
         default: latest
         type: string
-      limitadorOperatorVersion:
+      limitadorperatorVersion:
         description: Limitador Operator bundle version
         default: latest
         type: string
@@ -208,3 +208,5 @@ jobs:
           password: ${{ secrets.IMG_REGISTRY_TOKEN }}
       - name: Print Image URL
         run: echo "Image pushed to ${{ steps.push-to-quay.outputs.registry-paths }}"
+
+  
\ No newline at end of file
diff --git a/.github/workflows/build-images-pr.yaml b/.github/workflows/build-images-pr.yaml
new file mode 100644
index 000000000..c1b470cc4
--- /dev/null
+++ b/.github/workflows/build-images-pr.yaml
@@ -0,0 +1,36 @@
+name: PR Conditional Build and Push Image to Quay.io Repo
+
+on:
+  pull_request_target:
+    types: [labeled, opened, synchronize, reopened]
+
+jobs:
+  pr-conditional-build:
+    name: PR Conditional Build and Push Image to Quay.io repo
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'forked_image_approved') }}
+    steps:
+      - name: Check out the repository
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Quay.io
+        uses: docker/login-action@v2
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          tags: |
+            quay.io/dlawton/kuadrant_operator:latest
+            quay.io/dlawton/kuadrant_operator:${{ github.sha }}
diff --git a/hack/topology_setup.sh b/hack/topology_setup.sh
deleted file mode 100755
index 4220f3219..000000000
--- a/hack/topology_setup.sh
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/bash
-
-applyGateway(){
-    echo "Applying Gateway"
-    kubectl -n istio-system apply -f - <<EOF
-apiVersion: gateway.networking.k8s.io/v1beta1
-kind: Gateway
-metadata:
-  name: paying-customer-gw
-  annotations:
-    kuadrant.io/namespace: kuadrant-system
-    networking.istio.io/service-type: ClusterIP
-spec:
-  gatewayClassName: istio
-  listeners:
-    - name: websites
-      port: 80
-      protocol: HTTP
-      hostname: '*.website'
-      allowedRoutes:
-        namespaces:
-          from: All
-    - name: apis
-      port: 80
-      protocol: HTTP
-      hostname: '*.io'
-      allowedRoutes:
-        namespaces:
-          from: All
----
-apiVersion: gateway.networking.k8s.io/v1beta1
-kind: Gateway
-metadata:
-  name: free-tier-gw
-spec:
-  gatewayClassName: istio
-  listeners:
-    - name: websites
-      port: 80
-      protocol: HTTP
-      hostname: '*.website'
-      allowedRoutes:
-        namespaces:
-          from: All
-    - name: apis
-      port: 80
-      protocol: HTTP
-      hostname: '*.io'
-      allowedRoutes:
-        namespaces:
-          from: All
----
-
-apiVersion: gateway.networking.k8s.io/v1beta1
-kind: HTTPRoute
-metadata:
-  name: customer-domain-route
-spec:
-  parentRefs:
-  - namespace: istio-system
-    name: paying-customer-gw
-  hostnames:
-  - '*.website'
-  rules:
-  - matches:
-    - method: GET
-      path: 
-        type: PathPrefix
-        value: "/v1/"
-    - method: POST
-      path: 
-        type: PathPrefix
-        value: "/v1/"
-    backendRefs:
-    - name: toystore
-      port: 80
-  - matches:
-    - path: 
-        type: PathPrefix
-        value: "/assets/"
-    backendRefs:
-    - name: toystore
-      port: 80
-
----
-apiVersion: gateway.networking.k8s.io/v1beta1
-kind: HTTPRoute
-metadata:
-  name: account-management-route
-spec:
-  parentRefs:
-  - namespace: istio-system
-    name: paying-customer-gw
-  - namespace: istio-system
-    name: free-tier-gw
-  hostnames:
-  - status.io
-  - status.local
-  rules:
-  - backendRefs:
-    - name: toystore
-      port: 80
-
----
-
-apiVersion: gateway.networking.k8s.io/v1beta1
-kind: HTTPRoute
-metadata:
-  name: joe-bloggs-route
-spec:
-  parentRefs:
-  - namespace: istio-system
-    name: free-tier-gw
-  rules:
-  - matches:
-    - path: 
-        type: PathPrefix
-        value: "/v1/"
-    - path: 
-        type: PathPrefix
-        value: "/v2/"
-    backendRefs:
-    - name: toystore
-      port: 80
-
----
-
-apiVersion: kuadrant.io/v1beta2
-kind: RateLimitPolicy
-metadata:
-  name: paying-customer-rate-limit
-  namespace: istio-system
-spec:
-  targetRef:
-    group: gateway.networking.k8s.io
-    kind: Gateway
-    name: paying-customer-gw
-  limits:
-    "high-priority":
-      rates:
-        - limit: 100
-          duration: 1
-          unit: second
-
----
-
-apiVersion: kuadrant.io/v1beta2
-kind: RateLimitPolicy
-metadata:
-  name: free-tier-rate-limit
-  namespace: istio-system
-spec:
-  targetRef:
-    group: gateway.networking.k8s.io
-    kind: Gateway
-    name: free-tier-gw
-  limits:
-    "low-priority":
-      rates:
-        - limit: 10
-          duration: 1
-          unit: second
-
-EOF
-}
-
-applyGateway
\ No newline at end of file