diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
new file mode 100644
index 000000000..57894ef23
--- /dev/null
+++ b/.github/workflows/cd.yaml
@@ -0,0 +1,43 @@
+name: CD
+
+on:
+  merge_group:
+    types:
+      - checks_requested
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build Query Connector Image
+    runs-on: ubuntu-latest
+    permissions:
+      contents: "read"
+      id-token: "write"
+      packages: "write"
+    steps:
+      - name: Check Out Changes
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        working-directory: ./query-connector
+        with:
+          push: true
+          tags: [main, latest]
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 09c7de833..1d2fd173e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,38 +1,16 @@
 repos:
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.9
-    hooks:
-      # Run the linter.
-      - id: ruff
-        args: [--fix]
-      # Run the formatter.
-      - id: ruff-format
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
       - id: pretty-format-json
+        name: Pretty Format JSON
         args: [--autofix, --no-sort-keys]
   - repo: https://github.com/pre-commit/mirrors-eslint
     rev: "v9.12.0"
     hooks:
       - id: eslint
-        name: ESLint for ECR Viewer
-        files: ^containers/ecr-viewer/.*\.[jt]sx?$ # *.js, *.jsx, *.ts and *.tsx in containers/ecr-viewer
-        types: [file]
-        additional_dependencies:
-          - eslint@8.56.0
-          - eslint-config-next
-          - eslint-config-prettier
-          - "@typescript-eslint/parser"
-          - "@typescript-eslint/eslint-plugin"
-          - typescript
-          - "@next/eslint-plugin-next"
-          - eslint-plugin-unused-imports
-          - eslint-plugin-jsdoc
-        args: ["--config=./containers/ecr-viewer/.eslintrc.json", "--fix"]
-      - id: eslint
-        name: ESLint for TEFCA Viewer
-        files: ^containers/tefca-viewer/.*\.[jt]sx?$ # *.js, *.jsx, *.ts and *.tsx
+        name: ESLint
+        files: ^query-connector/.*\.[jt]sx?$ # *.js, *.jsx, *.ts and *.tsx
         types: [file]
         additional_dependencies:
           - eslint@8.56.0
@@ -44,24 +22,13 @@ repos:
           - "@next/eslint-plugin-next"
           - eslint-plugin-unused-imports
           - eslint-plugin-jsdoc
-        args: ["--config=./containers/tefca-viewer/.eslintrc.json", "--fix"]
+        args: ["--config=./query-connector/.eslintrc.json", "--fix"]
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
+        name: Prettier
         types_or: [css, javascript, tsx, ts, yaml]
-  - repo: local
-    hooks:
-      # run `terraform fmt` if tf files are modified and terraform is installed
-      # when terraform is not installed, this check will succeed even if tf files
-      # would not pass the format check
-      - id: terraform-fmt
-        name: terraform-fmt
-        entry: bash -c 'if command -v terraform >/dev/null 2>&1; then terraform fmt -recursive -check operations; else exit 0; fi'
-        language: system
-        types:
-          - terraform
-        pass_filenames: false
 ci:
   autofix_commit_msg: |
     [pre-commit.ci] auto fixes from pre-commit hooks
@@ -69,5 +36,5 @@ ci:
   autoupdate_branch: ""
   autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate"
   autoupdate_schedule: weekly
-  skip: [pretty-format-json, terraform-fmt]
+  skip: [pretty-format-json]
   submodules: false
diff --git a/containers/tefca-viewer/flyway/sql/V01_05__insert_nbs_hardcoded_values.sql b/query-connector/flyway/sql/V01_05__insert_nbs_hardcoded_values.sql
similarity index 100%
rename from containers/tefca-viewer/flyway/sql/V01_05__insert_nbs_hardcoded_values.sql
rename to query-connector/flyway/sql/V01_05__insert_nbs_hardcoded_values.sql
diff --git a/query-connector/src/app/query/components/ResultsView.tsx b/query-connector/src/app/query/components/ResultsView.tsx
index 7b819c704..0ddd5741d 100644
--- a/query-connector/src/app/query/components/ResultsView.tsx
+++ b/query-connector/src/app/query/components/ResultsView.tsx
@@ -12,11 +12,7 @@ import EncounterTable from "./resultsView/tableComponents/EncounterTable";
 import MedicationRequestTable from "./resultsView/tableComponents/MedicationRequestTable";
 import ObservationTable from "./resultsView/tableComponents/ObservationTable";
 import Backlink from "./backLink/Backlink";
-import {
-  USE_CASES,
-  UseCaseToQueryName,
-  demoQueryValToLabelMap,
-} from "@/app/constants";
+import { USE_CASES, demoQueryValToLabelMap } from "@/app/constants";
 
 type ResultsViewProps = {
   useCaseQueryResponse: UseCaseQueryResponse;
diff --git a/secret.out b/secret.out
deleted file mode 100644
index e69de29bb..000000000