diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml
index fb340b2ba..c93cec08f 100644
--- a/.github/workflows/go.yaml
+++ b/.github/workflows/go.yaml
@@ -64,21 +64,21 @@ jobs:
     outputs:
       steampipe: ${{ steps.build_services.outputs.steampipe }}
       auth-service: ${{ steps.build_services.outputs.auth-service }}
-      checkup-worker: ${{ steps.build_services.outputs.checkup-worker }}
-      compliance-report-worker: ${{ steps.build_services.outputs.compliance-report-worker }}
+      checkup-job: ${{ steps.build_services.outputs.checkup-job }}
+      compliance-report-job: ${{ steps.build_services.outputs.compliance-report-job }}
       compliance-service: ${{ steps.build_services.outputs.compliance-service }}
-      compliance-summarizer: ${{ steps.build_services.outputs.compliance-summarizer }}
-      describe-scheduler: ${{ steps.build_services.outputs.describe-scheduler }}
+      compliance-summarizer-job: ${{ steps.build_services.outputs.compliance-summarizer-job }}
+      describe-scheduler-service: ${{ steps.build_services.outputs.describe-scheduler-service }}
       inventory-service: ${{ steps.build_services.outputs.inventory-service }}
       metadata-service: ${{ steps.build_services.outputs.metadata-service }}
-      post-install-worker: ${{ steps.build_services.outputs.post-install-worker }}
+      post-install-job: ${{ steps.build_services.outputs.post-install-job }}
       swagger-ui: ${{ steps.build_services.outputs.swagger-ui }}
-      steampipe-plugin-opengovernance: ${{ steps.build_services.outputs.steampipe-plugin-opengovernance }}
+      cloudql: ${{ steps.build_services.outputs.cloudql }}
       integration-service: ${{ steps.build_services.outputs.integration-service }}
       es-sink-service: ${{ steps.build_services.outputs.es-sink-service }}
-      query-runner-worker: ${{ steps.build_services.outputs.query-runner-worker }}
-      query-validator-worker: ${{ steps.build_services.outputs.query-validator-worker }}
-      demo-importer-worker: ${{ steps.build_services.outputs.demo-importer-worker }}
+      query-runner-job: ${{ steps.build_services.outputs.query-runner-job }}
+      query-validator-job: ${{ steps.build_services.outputs.query-validator-job }}
+      demo-importer-job: ${{ steps.build_services.outputs.demo-importer-job }}
       
     env:
       SERVICE_LIST: ${{ github.event.inputs.servicesList }}
@@ -146,12 +146,12 @@ jobs:
     needs:
       - build
       - tag
-      - deploy-steampipe-plugin-opengovernance
+      - deploy-cloudql
     permissions:
       id-token: write
       contents: read
     environment: docker
-    if: (needs.build.outputs.steampipe-plugin-opengovernance == 'true' || needs.build.outputs.steampipe == 'true') && github.event_name != 'pull_request'
+    if: (needs.build.outputs.cloudql == 'true' || needs.build.outputs.steampipe == 'true') && github.event_name != 'pull_request'
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -216,7 +216,7 @@ jobs:
           file: docker/AuthServiceDockerfile
           context: .
 
-  deploy-checkup-worker:
+  deploy-checkup-job:
     runs-on: ubuntu-latest
     needs:
       - build
@@ -225,7 +225,7 @@ jobs:
       id-token: write
       contents: read
     environment: docker
-    if: needs.build.outputs.checkup-worker == 'true' && github.event_name != 'pull_request'
+    if: needs.build.outputs.checkup-job == 'true' && github.event_name != 'pull_request'
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -248,22 +248,22 @@ jobs:
         with:
           push: true
           tags: |
-            ghcr.io/${{ github.repository_owner }}/checkup-worker:${{ needs.tag.outputs.latest_tag }}
-          file: docker/CheckupWorkerDockerfile
+            ghcr.io/${{ github.repository_owner }}/checkup-job:${{ needs.tag.outputs.latest_tag }}
+          file: docker/CheckupJobDockerfile
           context: .
 
-  deploy-compliance-report-worker:
+  deploy-compliance-report-job:
     runs-on: ubuntu-latest
     needs:
       - build
       - tag
-      - deploy-steampipe-plugin-opengovernance
+      - deploy-cloudql
       - deploy-steampipe
     permissions:
       id-token: write
       contents: read
     environment: docker
-    if: (needs.build.outputs.steampipe-plugin-opengovernance == 'true' || needs.build.outputs.compliance-report-worker == 'true') && github.event_name != 'pull_request'
+    if: (needs.build.outputs.cloudql == 'true' || needs.build.outputs.compliance-report-job == 'true') && github.event_name != 'pull_request'
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -286,13 +286,13 @@ jobs:
         with:
           push: true
           tags: |
-            ghcr.io/${{ github.repository_owner }}/compliance-report-worker:${{ needs.tag.outputs.latest_tag }}
-          file: docker/ComplianceReportWorkerDockerfile
+            ghcr.io/${{ github.repository_owner }}/compliance-report-job:${{ needs.tag.outputs.latest_tag }}
+          file: docker/ComplianceReportJobDockerfile
           build-args: |
             PLUGIN_REGISTRY=ghcr.io/opengovern
           context: .
 
-  deploy-compliance-summarizer:
+  deploy-compliance-summarizer-job:
     runs-on: ubuntu-latest
     needs:
       - build
@@ -301,7 +301,7 @@ jobs:
       id-token: write
       contents: read
     environment: docker
-    if: needs.build.outputs.compliance-summarizer == 'true' && github.event_name != 'pull_request'
+    if: needs.build.outputs.compliance-summarizer-job == 'true' && github.event_name != 'pull_request'
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -324,8 +324,8 @@ jobs:
         with:
           push: true
           tags: |
-            ghcr.io/${{ github.repository_owner }}/compliance-summarizer:${{ needs.tag.outputs.latest_tag }}
-          file: docker/ComplianceSummarizerDockerfile
+            ghcr.io/${{ github.repository_owner }}/compliance-summarizer-job:${{ needs.tag.outputs.latest_tag }}
+          file: docker/ComplianceSummarizerJobDockerfile
           build-args: |
             PLUGIN_REGISTRY=ghcr.io/opengovern
           context: .
@@ -366,7 +366,7 @@ jobs:
           file: docker/ComplianceServiceDockerfile
           context: .
 
-  deploy-describe-scheduler:
+  deploy-describe-scheduler-service:
     runs-on: ubuntu-latest
     needs:
       - build
@@ -375,7 +375,7 @@ jobs:
       id-token: write
       contents: read
     environment: docker
-    if: needs.build.outputs.describe-scheduler == 'true' && github.event_name != 'pull_request'
+    if: needs.build.outputs.describe-scheduler-service == 'true' && github.event_name != 'pull_request'
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -398,8 +398,8 @@ jobs:
         with:
           push: true
           tags: |
-            ghcr.io/${{ github.repository_owner }}/describe-scheduler:${{ needs.tag.outputs.latest_tag }}
-          file: docker/DescribeSchedulerDockerfile
+            ghcr.io/${{ github.repository_owner }}/describe-scheduler-service:${{ needs.tag.outputs.latest_tag }}
+          file: docker/DescribeSchedulerServiceDockerfile
           context: .
 
   deploy-integration-service:
@@ -545,7 +545,7 @@ jobs:
           file: docker/MetadataServiceDockerfile
           context: .
 
-  deploy-post-install-worker:
+  deploy-post-install-job:
     runs-on: ubuntu-latest
     needs:
       - build
@@ -554,7 +554,7 @@ jobs:
       id-token: write
       contents: read
     environment: docker
-    if: needs.build.outputs.post-install-worker == 'true' && github.event_name != 'pull_request'
+    if: needs.build.outputs.post-install-job == 'true' && github.event_name != 'pull_request'
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -577,8 +577,8 @@ jobs:
         with:
           push: true
           tags: |
-            ghcr.io/${{ github.repository_owner }}/post-install:${{ needs.tag.outputs.latest_tag }}
-          file: docker/PostInstallDockerfile
+            ghcr.io/${{ github.repository_owner }}/post-install-job:${{ needs.tag.outputs.latest_tag }}
+          file: docker/PostInstallJobDockerfile
           context: .
   deploy-swagger-ui:
     runs-on: ubuntu-latest
@@ -617,7 +617,7 @@ jobs:
           context: .
 
 
-  deploy-steampipe-plugin-opengovernance:
+  deploy-cloudql:
     runs-on: ubuntu-latest
     needs:
       - build
@@ -626,14 +626,14 @@ jobs:
       id-token: write
       contents: read
     environment: docker
-    if: (needs.build.outputs.steampipe-plugin-opengovernance == 'true' ||
+    if: (needs.build.outputs.cloudql == 'true' ||
       needs.build.outputs.steampipe == 'true' ||
-      needs.build.outputs.compliance-report-worker == 'true') && github.event_name != 'pull_request'
+      needs.build.outputs.compliance-report-job == 'true') && github.event_name != 'pull_request'
     steps:
       - name: Check if we need to actually push
         id: check_if_push
         run: |
-          if [[ -z "${{ needs.build.outputs.steampipe-plugin-opengovernance }}" ]]; then
+          if [[ -z "${{ needs.build.outputs.cloudql }}" ]]; then
             echo "do_build=false" >> $GITHUB_OUTPUT
           else
             echo "do_build=true" >> $GITHUB_OUTPUT
@@ -663,25 +663,25 @@ jobs:
         with:
           push: true
           tags: |
-            ghcr.io/${{ github.repository_owner }}/steampipe-plugin-opengovernance:0.0.1
-            ghcr.io/${{ github.repository_owner }}/steampipe-plugin-opengovernance:${{ needs.tag.outputs.latest_tag }}
-          file: docker/SteampipePluginOpengovernanceDockerfile
+            ghcr.io/${{ github.repository_owner }}/cloudql:0.0.1
+            ghcr.io/${{ github.repository_owner }}/cloudql:${{ needs.tag.outputs.latest_tag }}
+          file: docker/CloudQLDockerfile
           context: .
 
 
 
-  deploy-query-runner-worker:
+  deploy-query-runner-job:
     runs-on: ubuntu-latest
     needs:
       - build
       - tag
-      - deploy-steampipe-plugin-opengovernance
+      - deploy-cloudql
       - deploy-steampipe
     permissions:
       id-token: write
       contents: read
     environment: docker
-    if: needs.build.outputs.query-runner-worker == 'true' && github.event_name != 'pull_request'
+    if: needs.build.outputs.query-runner-job == 'true' && github.event_name != 'pull_request'
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -704,24 +704,24 @@ jobs:
         with:
           push: true
           tags: |
-            ghcr.io/${{ github.repository_owner }}/query-runner-worker:${{ needs.tag.outputs.latest_tag }}
-          file: docker/QueryRunnerWorkerDockerfile
+            ghcr.io/${{ github.repository_owner }}/query-runner-job:${{ needs.tag.outputs.latest_tag }}
+          file: docker/QueryRunnerJobDockerfile
           build-args: |
             PLUGIN_REGISTRY=ghcr.io/opengovern
           context: .
 
-  deploy-query-validator-worker:
+  deploy-query-validator-job:
     runs-on: ubuntu-latest
     needs:
       - build
       - tag
-      - deploy-steampipe-plugin-opengovernance
+      - deploy-cloudql
       - deploy-steampipe
     permissions:
       id-token: write
       contents: read
     environment: docker
-    if: needs.build.outputs.query-validator-worker == 'true' && github.event_name != 'pull_request'
+    if: needs.build.outputs.query-validator-job == 'true' && github.event_name != 'pull_request'
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -744,8 +744,8 @@ jobs:
         with:
           push: true
           tags: |
-            ghcr.io/${{ github.repository_owner }}/query-validator-worker:${{ needs.tag.outputs.latest_tag }}
-          file: docker/QueryValidatorWorkerDockerfile
+            ghcr.io/${{ github.repository_owner }}/query-validator-job:${{ needs.tag.outputs.latest_tag }}
+          file: docker/QueryValidatorJobDockerfile
           build-args: |
             PLUGIN_REGISTRY=ghcr.io/opengovern
           context: .
@@ -806,7 +806,7 @@ jobs:
           build-args: |
             PLUGIN_REGISTRY=ghcr.io/opengovern
           context: .
-  deploy-demo-importer-worker:
+  deploy-demo-importer-job:
     runs-on: ubuntu-latest
     needs:
       - build
@@ -815,7 +815,7 @@ jobs:
       id-token: write
       contents: read
     environment: docker
-    if: needs.build.outputs.demo-importer-worker == 'true' && github.event_name != 'pull_request'
+    if: needs.build.outputs.demo-importer-job == 'true' && github.event_name != 'pull_request'
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -838,8 +838,8 @@ jobs:
         with:
           push: true
           tags: |
-            ghcr.io/${{ github.repository_owner }}/demo-importer:${{ needs.tag.outputs.latest_tag }}
-          file: docker/DemoImporterDockerfile
+            ghcr.io/${{ github.repository_owner }}/demo-importer-job:${{ needs.tag.outputs.latest_tag }}
+          file: docker/DemoImporterJobDockerfile
           context: .
 
   deploy-dex-login:
diff --git a/.github/workflows/ui.yaml b/.github/workflows/ui.yaml
index fc29bd9d1..64c0686fe 100644
--- a/.github/workflows/ui.yaml
+++ b/.github/workflows/ui.yaml
@@ -87,6 +87,6 @@ jobs:
           platforms: linux/amd64,linux/arm64
           tags: |
             ghcr.io/${{ github.repository_owner }}/web-ui:${{ steps.tag_version.outputs.new_tag }}
-          file: docker/WebUiDockerfile
+          file: docker/WebUiServiceDockerfile
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/build_services b/build_services
index 359230980..520b8e341 100644
--- a/build_services
+++ b/build_services
@@ -1,10 +1,10 @@
 auth-service
-checkup-worker
+checkup-job
 cli
 cloud-inventory
-compliance-report-worker
+compliance-report-job
 compliance-service
-describe-scheduler
+describe-scheduler-service-service-service-service-service-service
 hopper
 inventory-service
 metadata-service
@@ -14,5 +14,5 @@ reporter
 summarizer-worker
 swagger-ui
 cost-estimator-service
-query-runner-worker
-demo-importer-worker
\ No newline at end of file
+query-runner-job
+demo-importer-job
\ No newline at end of file
diff --git a/cmd/checkup-worker/main.go b/cmd/checkup-job/main.go
similarity index 100%
rename from cmd/checkup-worker/main.go
rename to cmd/checkup-job/main.go
diff --git a/cmd/steampipe-plugin-opengovernance/main.go b/cmd/cloudql/main.go
similarity index 100%
rename from cmd/steampipe-plugin-opengovernance/main.go
rename to cmd/cloudql/main.go
diff --git a/cmd/compliance-report-worker/main.go b/cmd/compliance-report-job/main.go
similarity index 100%
rename from cmd/compliance-report-worker/main.go
rename to cmd/compliance-report-job/main.go
diff --git a/cmd/compliance-summarizer/main.go b/cmd/compliance-summarizer-job/main.go
similarity index 100%
rename from cmd/compliance-summarizer/main.go
rename to cmd/compliance-summarizer-job/main.go
diff --git a/cmd/demo-importer-worker/main.go b/cmd/demo-importer-job/main.go
similarity index 100%
rename from cmd/demo-importer-worker/main.go
rename to cmd/demo-importer-job/main.go
diff --git a/cmd/describe-scheduler/main.go b/cmd/describe-scheduler-service/main.go
similarity index 100%
rename from cmd/describe-scheduler/main.go
rename to cmd/describe-scheduler-service/main.go
diff --git a/cmd/post-install-worker/main.go b/cmd/post-install-job/main.go
similarity index 100%
rename from cmd/post-install-worker/main.go
rename to cmd/post-install-job/main.go
diff --git a/cmd/query-runner-worker/main.go b/cmd/query-runner-job/main.go
similarity index 100%
rename from cmd/query-runner-worker/main.go
rename to cmd/query-runner-job/main.go
diff --git a/cmd/query-validator-worker/main.go b/cmd/query-validator-job/main.go
similarity index 100%
rename from cmd/query-validator-worker/main.go
rename to cmd/query-validator-job/main.go
diff --git a/docker/CheckupWorkerDockerfile b/docker/CheckupJobDockerfile
similarity index 74%
rename from docker/CheckupWorkerDockerfile
rename to docker/CheckupJobDockerfile
index 87c0547e3..de93c66e1 100644
--- a/docker/CheckupWorkerDockerfile
+++ b/docker/CheckupJobDockerfile
@@ -3,5 +3,5 @@ RUN apk --no-cache add ca-certificates
 
 FROM scratch
 COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY ./build/checkup-worker /
-CMD [ "/checkup-worker" ]
\ No newline at end of file
+COPY ./build/checkup-job /
+CMD [ "/checkup-job" ]
\ No newline at end of file
diff --git a/docker/CloudQLDockerfile b/docker/CloudQLDockerfile
new file mode 100644
index 000000000..1eab7b6dd
--- /dev/null
+++ b/docker/CloudQLDockerfile
@@ -0,0 +1,3 @@
+FROM alpine:latest
+
+COPY ./build/cloudql /cloudql.plugin
diff --git a/docker/QueryRunnerWorkerDockerfile b/docker/ComplianceReportJobDockerfile
similarity index 84%
rename from docker/QueryRunnerWorkerDockerfile
rename to docker/ComplianceReportJobDockerfile
index 7d3b8681e..9b4ac6296 100644
--- a/docker/QueryRunnerWorkerDockerfile
+++ b/docker/ComplianceReportJobDockerfile
@@ -4,7 +4,7 @@ FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azure:0.0.1 as azure
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azuread:0.0.1 as azuread
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-github:0.0.1 as github
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-digitalocean:0.0.1 as digitalocean
-FROM ${PLUGIN_REGISTRY}/steampipe-plugin-opengovernance:0.0.1 as opengovernance
+FROM ${PLUGIN_REGISTRY}/cloudql:0.0.1 as opengovernance
 
 FROM ubuntu:20.04 AS base
 RUN apt-get update && apt-get install -y \
@@ -19,7 +19,7 @@ COPY --from=azure /steampipe-plugin-azure.plugin /home/steampipe/.steampipe/plug
 COPY --from=azuread /steampipe-plugin-azuread.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azuread@latest/steampipe-plugin-azuread.plugin
 COPY --from=github /steampipe-plugin-github.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/github@latest/steampipe-plugin-github.plugin
 COPY --from=digitalocean /steampipe-plugin-digitalocean.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/digitalocean@latest/steampipe-plugin-digitalocean.plugin
-COPY --from=opengovernance /steampipe-plugin-opengovernance.plugin /home/steampipe/.steampipe/plugins/local/opengovernance/opengovernance.plugin
+COPY --from=opengovernance /cloudql.plugin /home/steampipe/.steampipe/plugins/local/opengovernance/opengovernance.plugin
 
 USER root
 RUN useradd -ms /bin/bash steampipe
@@ -34,7 +34,7 @@ USER steampipe
 
 RUN steampipe plugin list
 
-COPY ./build/query-runner-worker /
+COPY ./build/compliance-report-job /
 
-ENTRYPOINT [ "/query-runner-worker" ]
-CMD [ "/query-runner-worker" ]
\ No newline at end of file
+ENTRYPOINT [ "/compliance-report-job" ]
+CMD [ "/compliance-report-job" ]
\ No newline at end of file
diff --git a/docker/ComplianceSummarizerDockerfile b/docker/ComplianceSummarizerJobDockerfile
similarity index 67%
rename from docker/ComplianceSummarizerDockerfile
rename to docker/ComplianceSummarizerJobDockerfile
index b0c19b9cb..5ee79b7a1 100644
--- a/docker/ComplianceSummarizerDockerfile
+++ b/docker/ComplianceSummarizerJobDockerfile
@@ -3,5 +3,5 @@ RUN apk --no-cache add ca-certificates
 
 FROM scratch
 COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY ./build/compliance-summarizer /
-CMD [ "/compliance-summarizer" ]
\ No newline at end of file
+COPY ./build/compliance-summarizer-job /
+CMD [ "/compliance-summarizer-job" ]
\ No newline at end of file
diff --git a/docker/DescribeSchedulerDockerfile b/docker/DemoImporterJobDockerfile
similarity index 71%
rename from docker/DescribeSchedulerDockerfile
rename to docker/DemoImporterJobDockerfile
index 88a155219..b9f2aeb37 100644
--- a/docker/DescribeSchedulerDockerfile
+++ b/docker/DemoImporterJobDockerfile
@@ -3,5 +3,5 @@ RUN apk --no-cache add ca-certificates
 
 FROM scratch
 COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY ./build/describe-scheduler /
-CMD [ "/describe-scheduler" ]
\ No newline at end of file
+COPY ./build/demo-importer-job /
+CMD [ "/demo-importer-job" ]
\ No newline at end of file
diff --git a/docker/DemoImporterDockerfile b/docker/DescribeSchedulerServiceDockerfile
similarity index 66%
rename from docker/DemoImporterDockerfile
rename to docker/DescribeSchedulerServiceDockerfile
index fabe455e8..db7f455e6 100644
--- a/docker/DemoImporterDockerfile
+++ b/docker/DescribeSchedulerServiceDockerfile
@@ -3,5 +3,5 @@ RUN apk --no-cache add ca-certificates
 
 FROM scratch
 COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY ./build/demo-importer-worker /
-CMD [ "/demo-importer-worker" ]
\ No newline at end of file
+COPY ./build/describe-scheduler-service /
+CMD [ "/describe-scheduler-service" ]
\ No newline at end of file
diff --git a/docker/PostInstallDockerfile b/docker/PostInstallJobDockerfile
similarity index 71%
rename from docker/PostInstallDockerfile
rename to docker/PostInstallJobDockerfile
index 412e31bb0..0a7d58ae5 100644
--- a/docker/PostInstallDockerfile
+++ b/docker/PostInstallJobDockerfile
@@ -3,5 +3,5 @@ RUN apk --no-cache add ca-certificates
 
 FROM scratch
 COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY ./build/post-install-worker /
-CMD [ "/post-install-worker" ]
\ No newline at end of file
+COPY ./build/post-install-job /
+CMD [ "/post-install-job" ]
\ No newline at end of file
diff --git a/docker/QueryValidatorWorkerDockerfile b/docker/QueryRunnerJobDockerfile
similarity index 83%
rename from docker/QueryValidatorWorkerDockerfile
rename to docker/QueryRunnerJobDockerfile
index 0d1b8b9ee..3d9fff89a 100644
--- a/docker/QueryValidatorWorkerDockerfile
+++ b/docker/QueryRunnerJobDockerfile
@@ -4,7 +4,7 @@ FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azure:0.0.1 as azure
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azuread:0.0.1 as azuread
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-github:0.0.1 as github
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-digitalocean:0.0.1 as digitalocean
-FROM ${PLUGIN_REGISTRY}/steampipe-plugin-opengovernance:0.0.1 as opengovernance
+FROM ${PLUGIN_REGISTRY}/cloudql:0.0.1 as opengovernance
 
 FROM ubuntu:20.04 AS base
 RUN apt-get update && apt-get install -y \
@@ -19,7 +19,7 @@ COPY --from=azure /steampipe-plugin-azure.plugin /home/steampipe/.steampipe/plug
 COPY --from=azuread /steampipe-plugin-azuread.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azuread@latest/steampipe-plugin-azuread.plugin
 COPY --from=github /steampipe-plugin-github.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/github@latest/steampipe-plugin-github.plugin
 COPY --from=digitalocean /steampipe-plugin-digitalocean.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/digitalocean@latest/steampipe-plugin-digitalocean.plugin
-COPY --from=opengovernance /steampipe-plugin-opengovernance.plugin /home/steampipe/.steampipe/plugins/local/opengovernance/opengovernance.plugin
+COPY --from=opengovernance /cloudql.plugin /home/steampipe/.steampipe/plugins/local/opengovernance/opengovernance.plugin
 
 USER root
 RUN useradd -ms /bin/bash steampipe
@@ -34,7 +34,7 @@ USER steampipe
 
 RUN steampipe plugin list
 
-COPY ./build/query-validator-worker /
+COPY ./build/query-runner-job /
 
-ENTRYPOINT [ "/query-validator-worker" ]
-CMD [ "/query-validator-worker" ]
\ No newline at end of file
+ENTRYPOINT [ "/query-runner-job" ]
+CMD [ "/query-runner-job" ]
\ No newline at end of file
diff --git a/docker/ComplianceReportWorkerDockerfile b/docker/QueryValidatorJobDockerfile
similarity index 83%
rename from docker/ComplianceReportWorkerDockerfile
rename to docker/QueryValidatorJobDockerfile
index b7ac34a07..d8b7183cf 100644
--- a/docker/ComplianceReportWorkerDockerfile
+++ b/docker/QueryValidatorJobDockerfile
@@ -4,7 +4,7 @@ FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azure:0.0.1 as azure
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azuread:0.0.1 as azuread
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-github:0.0.1 as github
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-digitalocean:0.0.1 as digitalocean
-FROM ${PLUGIN_REGISTRY}/steampipe-plugin-opengovernance:0.0.1 as opengovernance
+FROM ${PLUGIN_REGISTRY}/cloudql:0.0.1 as opengovernance
 
 FROM ubuntu:20.04 AS base
 RUN apt-get update && apt-get install -y \
@@ -19,7 +19,7 @@ COPY --from=azure /steampipe-plugin-azure.plugin /home/steampipe/.steampipe/plug
 COPY --from=azuread /steampipe-plugin-azuread.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azuread@latest/steampipe-plugin-azuread.plugin
 COPY --from=github /steampipe-plugin-github.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/github@latest/steampipe-plugin-github.plugin
 COPY --from=digitalocean /steampipe-plugin-digitalocean.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/digitalocean@latest/steampipe-plugin-digitalocean.plugin
-COPY --from=opengovernance /steampipe-plugin-opengovernance.plugin /home/steampipe/.steampipe/plugins/local/opengovernance/opengovernance.plugin
+COPY --from=opengovernance /cloudql.plugin /home/steampipe/.steampipe/plugins/local/opengovernance/opengovernance.plugin
 
 USER root
 RUN useradd -ms /bin/bash steampipe
@@ -34,7 +34,7 @@ USER steampipe
 
 RUN steampipe plugin list
 
-COPY ./build/compliance-report-worker /
+COPY ./build/query-validator-job /
 
-ENTRYPOINT [ "/compliance-report-worker" ]
-CMD [ "/compliance-report-worker" ]
\ No newline at end of file
+ENTRYPOINT [ "/query-validator-job" ]
+CMD [ "/query-validator-job" ]
\ No newline at end of file
diff --git a/docker/SteampipePluginOpengovernanceDockerfile b/docker/SteampipePluginOpengovernanceDockerfile
deleted file mode 100644
index c0b362ca4..000000000
--- a/docker/SteampipePluginOpengovernanceDockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM alpine:latest
-
-COPY ./build/steampipe-plugin-opengovernance /steampipe-plugin-opengovernance.plugin
diff --git a/docker/SteampipeServiceDockerfile b/docker/SteampipeServiceDockerfile
index 73eb35add..b2959624c 100644
--- a/docker/SteampipeServiceDockerfile
+++ b/docker/SteampipeServiceDockerfile
@@ -4,7 +4,7 @@ FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azure:0.0.1 as azure
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azuread:0.0.1 as azuread
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-github:0.0.1 as github
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-digitalocean:0.0.1 as digitalocean
-FROM ${PLUGIN_REGISTRY}/steampipe-plugin-opengovernance:0.0.1 as opengovernance
+FROM ${PLUGIN_REGISTRY}/cloudql:0.0.1 as opengovernance
 
 FROM ubuntu:20.04 AS base
 RUN apt-get update && apt-get install -y \
@@ -19,7 +19,7 @@ COPY --from=azure /steampipe-plugin-azure.plugin /home/steampipe/.steampipe/plug
 COPY --from=azuread /steampipe-plugin-azuread.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azuread@latest/steampipe-plugin-azuread.plugin
 COPY --from=github /steampipe-plugin-github.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/github@latest/steampipe-plugin-github.plugin
 COPY --from=digitalocean /steampipe-plugin-digitalocean.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/digitalocean@latest/steampipe-plugin-digitalocean.plugin
-COPY --from=opengovernance /steampipe-plugin-opengovernance.plugin /home/steampipe/.steampipe/plugins/local/opengovernance/opengovernance.plugin
+COPY --from=opengovernance /cloudql.plugin /home/steampipe/.steampipe/plugins/local/opengovernance/opengovernance.plugin
 
 USER root
 RUN useradd -ms /bin/bash steampipe
diff --git a/docker/WebUiDockerfile b/docker/WebUiServiceDockerfile
similarity index 100%
rename from docker/WebUiDockerfile
rename to docker/WebUiServiceDockerfile
diff --git a/pkg/cloudql/Makefile b/pkg/cloudql/Makefile
index 2ae11f6bc..6cfeae3ad 100644
--- a/pkg/cloudql/Makefile
+++ b/pkg/cloudql/Makefile
@@ -1,23 +1,23 @@
 .PHONY: install build clean
 
 build:
-	CC=/usr/bin/musl-gcc GOPRIVATE="github.com/opengovern" GOOS=linux GOARCH=amd64 go build -v -ldflags "-linkmode external -extldflags '-static' -s -w" -tags musl -o ./build/steampipe-plugin-opengovernance.plugin *.go
+	CC=/usr/bin/musl-gcc GOPRIVATE="github.com/opengovern" GOOS=linux GOARCH=amd64 go build -v -ldflags "-linkmode external -extldflags '-static' -s -w" -tags musl -o ./build/cloudql.plugin *.go
 
 docker-build:
-	docker build -f docker/Dockerfile . -t steampipe-plugin-opengovernance:0.0.1
-	docker build -f docker/Dockerfile . -t steampipe-plugin-opengovernance:0.0.1-$CI_PIPELINE_IID
+	docker build -f docker/Dockerfile . -t cloudql:0.0.1
+	docker build -f docker/Dockerfile . -t cloudql:0.0.1-$CI_PIPELINE_IID
 
 docker-push:
-	docker push steampipe-plugin-opengovernance:0.0.1
-	docker push steampipe-plugin-opengovernance:0.0.1-$CI_PIPELINE_IID
+	docker push cloudql:0.0.1
+	docker push cloudql:0.0.1-$CI_PIPELINE_IID
 
 podman-build:
-	podman build -f docker/Dockerfile . -t steampipe-plugin-opengovernance:0.0.1
-	podman build -f docker/Dockerfile . -t steampipe-plugin-opengovernance:0.0.1-$CI_PIPELINE_IID
+	podman build -f docker/Dockerfile . -t cloudql:0.0.1
+	podman build -f docker/Dockerfile . -t cloudql:0.0.1-$CI_PIPELINE_IID
 
 podman-push:
-	podman push steampipe-plugin-opengovernance:0.0.1
-	podman push steampipe-plugin-opengovernance:0.0.1-$CI_PIPELINE_IID
+	podman push cloudql:0.0.1
+	podman push cloudql:0.0.1-$CI_PIPELINE_IID
 
 clean:
 	rm -r ./build
diff --git a/pkg/cloudql/README.md b/pkg/cloudql/README.md
index c9b3f9f86..651f63527 100644
--- a/pkg/cloudql/README.md
+++ b/pkg/cloudql/README.md
@@ -1 +1 @@
-# steampipe-plugin-opengovernance
\ No newline at end of file
+# cloudql
\ No newline at end of file