diff --git a/README.md b/README.md
index 2724719..7c999b1 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@ Lists available categories.
 #### Categories Parameters
 
 - `category` (optional): Filter by category name(s) - comma-separated list
+- `client` (optional): Filter by client type (e.g., `mobile`, `desktop`) - defaults to `mobile`
 - `onlyname` (optional): If present, returns only category names
 - `fields` (optional): Comma-separated list of fields to include in the response (see [Field Selection API Documentation](#field-selection-api-documentation) for details)
 
@@ -63,7 +64,7 @@ Lists available categories.
 
 ```bash
 curl --request GET \
-  --url 'https://d{{HOST}}/v1/categories?category=Domain%20parking%2CCI'
+  --url 'https://{{HOST}}/v1/categories?category=Domain%20parking%2CCI&client=desktop'
 ```
 
 ```json
@@ -74,10 +75,7 @@ curl --request GET \
             "Jenkins",
             "TeamCity"
         ],
-        "origins": {
-            "mobile": 22,
-            "desktop": 35
-        },
+        "origins": 22,
         "category": "CI"
     },
     {
@@ -86,10 +84,7 @@ curl --request GET \
           "Cloudflare",
           "Arsys Domain Parking"
         ],
-        "origins": {
-            "mobile": 14,
-            "desktop": 8
-        },
+        "origins": 14,
         "category": "Domain parking"
     }
 ]
@@ -213,6 +208,7 @@ Provides technology adoption data.
 - `rank` (required): Filter by rank
 - `start` (optional): Filter by date range start (YYYY-MM-DD or 'latest')
 - `end` (optional): Filter by date range end (YYYY-MM-DD)
+- `version` (optional): Filter by version name(s) - comma-separated list (only when single technology is specified)
 
 #### Adoption Response
 
@@ -248,6 +244,7 @@ Provides Core Web Vitals metrics for technologies.
 - `rank` (required): Filter by rank
 - `start` (optional): Filter by date range start (YYYY-MM-DD or 'latest')
 - `end` (optional): Filter by date range end (YYYY-MM-DD)
+- `version` (optional): Filter by version name(s) - comma-separated list (only when single technology is specified)
 
 #### CWV Response
 
@@ -291,6 +288,7 @@ Provides Lighthouse scores for technologies.
 - `rank` (required): Filter by rank
 - `start` (optional): Filter by date range start (YYYY-MM-DD or 'latest')
 - `end` (optional): Filter by date range end (YYYY-MM-DD)
+- `version` (optional): Filter by version name(s) - comma-separated list (only when single technology is specified)
 
 #### Lighthouse Response
 
@@ -338,6 +336,7 @@ Provides Page Weight metrics for technologies.
 - `rank` (required): Filter by rank
 - `start` (optional): Filter by date range start (YYYY-MM-DD or 'latest')
 - `end` (optional): Filter by date range end (YYYY-MM-DD)
+- `version` (optional): Filter by version name(s) - comma-separated list (only when single technology is specified)
 
 #### Page Weight Response
 
@@ -399,6 +398,7 @@ Provides Lighthouse audits for technologies.
 - `rank` (required): Filter by rank
 - `start` (optional): Filter by date range start (YYYY-MM-DD or 'latest')
 - `end` (optional): Filter by date range end (YYYY-MM-DD)
+- `version` (optional): Filter by version name(s) - comma-separated list (only when single technology is specified)
 
 #### Audits Response
 
@@ -588,7 +588,7 @@ The categories and technologies endpoints now support custom field selection, al
 - `category` - Category name
 - `description` - Category description
 - `technologies` - Array of technology names in the category
-- `origins` - Array of origin companies/organizations
+- `origins` - Number of origins
 
 Get only category names:
 
@@ -608,7 +608,7 @@ GET /v1/categories?fields=category,description
 - `category` - Category name
 - `description` - Technology description
 - `icon` - Icon filename
-- `origins` - Array of origin companies/organizations
+- `origins` - Dictionary with origins per client
 
 Get only technology names and categories:
 
@@ -643,7 +643,7 @@ GET /v1/technologies?category=JavaScript%20Frameworks&fields=technology,icon
 
 - `technology` - Technology name
 - `version` - Version name
-- `origins` - Mobile and desktop origins
+- `origins` - Dictionary with origins per client
 
 Get only technology and version names:
 
diff --git a/src/.dockerignore b/src/.dockerignore
new file mode 100644
index 0000000..28a5ebd
--- /dev/null
+++ b/src/.dockerignore
@@ -0,0 +1,12 @@
+node_modules
+npm-debug.log
+.git
+.gitignore
+.env
+.nyc_output
+coverage
+*.md
+.DS_Store
+cloudbuild.yaml
+__tests__
+coverage
diff --git a/src/Dockerfile b/src/Dockerfile
new file mode 100644
index 0000000..15a1abd
--- /dev/null
+++ b/src/Dockerfile
@@ -0,0 +1,17 @@
+FROM node:22-slim
+
+# Set the working directory
+WORKDIR /app
+
+# Copy package files first for better layer caching
+COPY package*.json ./
+
+# Install dependencies (this layer will be cached unless package files change)
+RUN npm ci --only=production --quiet --no-fund --no-audit && npm cache clean --force
+
+ENV DATABASE=tech-report-api-prod
+
+# Copy source code
+COPY . .
+
+CMD ["node", "index.js"]
diff --git a/src/__tests__/routes.test.js b/src/__tests__/routes.test.js
index f84cd9b..38f5d48 100644
--- a/src/__tests__/routes.test.js
+++ b/src/__tests__/routes.test.js
@@ -233,6 +233,12 @@ describe('API Routes', () => {
       expect(Array.isArray(res.body)).toBe(true);
     });
 
+    it('should return adoption data with version parameter', async () => {
+      const res = await request(app).get('/v1/adoption?technology=WordPress&geo=ALL&rank=ALL&start=latest&version=5.0');
+      expect(res.statusCode).toEqual(200);
+      expect(Array.isArray(res.body)).toBe(true);
+    });
+
     it('should handle missing required parameters', async () => {
       const res = await request(app).get('/v1/adoption');
       expect(res.statusCode).toEqual(400);
diff --git a/src/controllers/categoriesController.js b/src/controllers/categoriesController.js
index 6a76918..84f7b79 100644
--- a/src/controllers/categoriesController.js
+++ b/src/controllers/categoriesController.js
@@ -8,7 +8,7 @@ const listCategories = async (req, res) => {
   const queryBuilder = async (params) => {
     /*
     // Validate parameters
-    const supportedParams = ['category', 'onlyname', 'fields'];
+    const supportedParams = ['category', 'onlyname', 'fields', 'client'];
     const providedParams = Object.keys(params);
     const unsupportedParams = providedParams.filter(param => !supportedParams.includes(param));
 
@@ -20,6 +20,7 @@ const listCategories = async (req, res) => {
     */
 
     const isOnlyNames = params.onlyname || typeof params.onlyname === 'string';
+    const client = params.client || 'mobile'; // Default client if not provided
     const hasCustomFields = params.fields && !isOnlyNames;
 
     let query = firestore.collection('categories').orderBy('category', 'asc');
@@ -32,11 +33,16 @@ const listCategories = async (req, res) => {
       }
     }
 
+    // Apply client filter
+    if (client) {
+      query = query.where('client', '==', client);
+    }
+
     // Apply field selection
     if (isOnlyNames) {
       query = query.select('category');
     } else if (hasCustomFields) {
-      const requestedFields = params.fields.split(',').map(f => f.trim());
+      const requestedFields = params.fields.split(',').map(f => f.trim()) || ['category', 'description', 'technologies', 'origins'];
       query = query.select(...requestedFields);
     }
 
@@ -56,7 +62,9 @@ const listCategories = async (req, res) => {
   // Include onlyname and fields in cache key calculation
   const customCacheKeyData = {
     onlyname: req.query.onlyname || false,
-    fields: req.query.fields
+    fields: req.query.fields,
+    category: req.query.category ? validateArrayParameter(req.query.category, 'category') : [],
+    client: req.query.client || 'mobile',
   };
 
   await executeQuery(req, res, 'categories', queryBuilder, dataProcessor, customCacheKeyData);
diff --git a/src/controllers/reportController.js b/src/controllers/reportController.js
index 9f24123..14ffaf7 100644
--- a/src/controllers/reportController.js
+++ b/src/controllers/reportController.js
@@ -1,5 +1,4 @@
-import { firestoreOld } from '../utils/db.js';
-const firestore = firestoreOld;
+import { firestore } from '../utils/db.js';
 
 import {
     REQUIRED_PARAMS,
@@ -55,7 +54,7 @@ const createReportController = (reportType) => {
 
             /*
             // Validate supported parameters
-            const supportedParams = ['technology', 'geo', 'rank', 'start', 'end'];
+            const supportedParams = ['technology', 'geo', 'rank', 'start', 'end', 'version'];
             const providedParams = Object.keys(params);
             const unsupportedParams = providedParams.filter(param => !supportedParams.includes(param));
 
@@ -78,8 +77,15 @@ const createReportController = (reportType) => {
                 return;
             }
 
-            // Validate and process technology array
-            const techArray = validateArrayParameter(params.technology, 'technology');
+            // Validate and process technologies
+            const technologiesArray = validateArrayParameter(params.technology, 'technology');
+
+            // Validate and process versions
+            // Apply version filter with special handling for 'ALL' case
+            let versionsArray = ['ALL'];
+            if (technologiesArray.length === 1 && params.version) {
+                versionsArray = validateArrayParameter(params.version, 'version');
+            }
 
             // Handle 'latest' date substitution
             let startDate = params.start;
@@ -91,7 +97,8 @@ const createReportController = (reportType) => {
             const queryFilters = {
                 geo: params.geo,
                 rank: params.rank,
-                technology: techArray,
+                technology: technologiesArray,
+                version: versionsArray,
                 startDate: startDate,
                 endDate: params.end
             };
@@ -113,21 +120,21 @@ const createReportController = (reportType) => {
             query = query.where('rank', '==', params.rank);
 
             // Apply technology filter with batch processing
-            query = query.where('technology', 'in', techArray);
+            query = query.where('technology', 'in', technologiesArray);
 
-            // Apply version filter with special handling for 'ALL' case
-            if (params.version && techArray.length === 1) {
-                //query = query.where('version', '==', params.version); // TODO: Uncomment when migrating to a new data schema
-            } else {
-                //query = query.where('version', '==', 'ALL');
-            }
+            // Apply version filter with batch processing
+            query = query.where('version', 'in', versionsArray);
 
             // Apply date filters
             if (startDate) query = query.where('date', '>=', startDate);
             if (params.end) query = query.where('date', '<=', params.end);
 
             // Apply field projection to optimize query
-            query = query.select('date', 'technology', config.dataField);
+            const selectFields = ['date', 'technology', config.dataField];
+            if (!(versionsArray.length === 1 && versionsArray[0] === 'ALL')) {
+                selectFields.push('version');
+            }
+            query = query.select(...selectFields);
 
             // Execute query
             const snapshot = await query.get();
diff --git a/src/controllers/technologiesController.js b/src/controllers/technologiesController.js
index 5d75aba..1858a8a 100644
--- a/src/controllers/technologiesController.js
+++ b/src/controllers/technologiesController.js
@@ -69,7 +69,9 @@ const listTechnologies = async (req, res) => {
   // Include onlyname and fields in cache key calculation
   const customCacheKeyData = {
     onlyname: req.query.onlyname || false,
-    fields: req.query.fields
+    fields: req.query.fields,
+    technology: req.query.technology ? validateTechnologyArray(req.query.technology) : [],
+    category: req.query.category ? validateArrayParameter(req.query.category, 'category') : [],
   };
 
   await executeQuery(req, res, 'technologies', queryBuilder, dataProcessor, customCacheKeyData);
diff --git a/src/package.json b/src/package.json
index c9764ac..2e0bfa8 100644
--- a/src/package.json
+++ b/src/package.json
@@ -10,7 +10,9 @@
   "scripts": {
     "start": "export DATABASE=tech-report-api-prod && node index.js",
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
-    "test:live": "bash ../test-api.sh"
+    "test:live": "bash ../test-api.sh",
+    "build": "docker build -t tech-report-api .",
+    "run": "docker run -p 8080:8080 tech-report-api"
   },
   "dependencies": {
     "@google-cloud/firestore": "7.11.2",
diff --git a/terraform/dev/local.auto.tfvars.template b/terraform/dev/local.auto.tfvars.template
deleted file mode 100644
index 3ebe52e..0000000
--- a/terraform/dev/local.auto.tfvars.template
+++ /dev/null
@@ -1,4 +0,0 @@
-google_service_account_api_gateway = ""
-google_service_account_cloud_functions = ""
-project_database = ""
-
diff --git a/terraform/dev/main.tf b/terraform/dev/main.tf
index db15672..94527ad 100644
--- a/terraform/dev/main.tf
+++ b/terraform/dev/main.tf
@@ -3,6 +3,13 @@ terraform {
     bucket = "tfstate-httparchive"
     prefix = "tech-report-apis/dev"
   }
+
+  required_providers {
+    docker = {
+      source  = "kreuzwerker/docker"
+      version = ">= 3.6.2"
+    }
+  }
 }
 
 provider "google" {
@@ -11,23 +18,30 @@ provider "google" {
   request_timeout = "60m"
 }
 
-resource "google_api_gateway_api" "api" {
-  provider     = google-beta
-  api_id       = "reports-api-dev"
-  display_name = "Reports API Gateway DEV"
-  project      = var.project
+provider "google-beta" {
+  project = var.project
+  region  = var.region
+}
+
+# Get current Google Cloud access token
+data "google_client_config" "default" {}
+
+# Configure Docker provider with Artifact Registry authentication
+provider "docker" {
+  registry_auth {
+    address  = "${var.region}-docker.pkg.dev"
+    username = "oauth2accesstoken"
+    password = data.google_client_config.default.access_token
+  }
 }
 
-resource "google_api_gateway_api_config" "api_config" {
-  provider             = google-beta
-  api                  = google_api_gateway_api.api.api_id
-  api_config_id_prefix = "reports-api-config-dev"
-  project              = var.project
-  display_name         = "Reports API Config DEV"
-  openapi_documents {
-    document {
-      path = "spec.yaml"
-      contents = base64encode(<<-EOF
+module "gateway" {
+  source                = "../modules/api-gateway"
+  project               = var.project
+  environment           = var.environment
+  region                = var.region
+  service_account_email = var.google_service_account_api_gateway
+  spec_yaml             = <<EOF
 swagger: "2.0"
 info:
   title: reports_api_config_dev
@@ -98,6 +112,13 @@ paths:
       responses:
         200:
           description: String
+  /v1/versions:
+    get:
+      summary: versions
+      operationId: getVersions
+      responses:
+        200:
+          description: String
   /v1/audits:
     get:
       summary: audits
@@ -106,48 +127,35 @@ paths:
         200:
           description: String
 EOF
-      )
-    }
-  }
-  gateway_config {
-    backend_config {
-      google_service_account = var.google_service_account_api_gateway
-    }
-  }
-}
-
-resource "google_api_gateway_gateway" "gateway" {
-  provider     = google-beta
-  project      = var.project
-  region       = var.region
-  api_config   = google_api_gateway_api_config.api_config.id
-  gateway_id   = "reports-dev"
-  display_name = "Reports API Gateway DEV"
-  labels = {
-    owner       = "tech_report_api"
-    environment = var.environment
-  }
-  depends_on = [google_api_gateway_api_config.api_config]
-  lifecycle {
-    replace_triggered_by = [
-      google_api_gateway_api_config.api_config
-    ]
-  }
 }
 
 module "endpoints" {
-  source                           = "./../modules/run-service"
-  entry_point                      = "app"
-  project                          = var.project
-  environment                      = var.environment
-  source_directory                 = "../../src"
-  function_name                    = "tech-report-api"
-  region                           = var.region
-  service_account_email            = var.google_service_account_cloud_functions
-  service_account_api_gateway      = var.google_service_account_api_gateway
-  min_instances                    = var.min_instances
+  source                      = "../modules/run-service"
+  project                     = var.project
+  environment                 = var.environment
+  source_directory            = "../../src"
+  service_name               = "tech-report-api"
+  region                      = var.region
+  service_account_email       = var.google_service_account_cloud_functions
+  service_account_api_gateway = var.google_service_account_api_gateway
+  min_instances               = var.min_instances
   environment_variables = {
     "PROJECT"  = var.project
     "DATABASE" = var.project_database
   }
 }
+
+moved {
+  from = google_api_gateway_api.api
+  to   = module.gateway.google_api_gateway_api.api
+}
+
+moved {
+  from = google_api_gateway_api_config.api_config
+  to   = module.gateway.google_api_gateway_api_config.api_config
+}
+
+moved {
+  from = google_api_gateway_gateway.gateway
+  to   = module.gateway.google_api_gateway_gateway.gateway
+}
diff --git a/terraform/dev/variables.tf b/terraform/dev/variables.tf
index 1112586..e06bcfc 100644
--- a/terraform/dev/variables.tf
+++ b/terraform/dev/variables.tf
@@ -15,7 +15,7 @@ variable "environment" {
 variable "project_database" {
   type        = string
   description = "The database name"
-  default     = "tech-report-api-prod" // TODO: Update this to the DEV database name
+  default     = "tech-report-api-dev"
 }
 variable "google_service_account_cloud_functions" {
   type        = string
diff --git a/terraform/modules/api-gateway/main.tf b/terraform/modules/api-gateway/main.tf
index e2bd9da..c2730ca 100644
--- a/terraform/modules/api-gateway/main.tf
+++ b/terraform/modules/api-gateway/main.tf
@@ -1,26 +1,34 @@
-######################################
-# API Gateway
-######################################
 # Used to expose Internal resources to external sources, such as web applications
 # See https://cloud.google.com/api-gateway/docs for more information
+
+terraform {
+  required_providers {
+    docker = {
+      source  = "hashicorp/google-beta"
+      version = ">= 6.38.0"
+    }
+  }
+}
+
 # The API used by the Gateway
 resource "google_api_gateway_api" "api" {
-  provider     = google-beta # API Gateway is still in beta
-  api_id       = "api-gw-${var.environment}"
-  display_name = "The ${var.environment} API Gateway"
+  provider     = google-beta
+  api_id       = "reports-api-${var.environment}"
+  display_name = "Reports API Gateway ${var.environment}"
   project      = var.project
 }
+
 # A Configuration, consisting of an OpenAPI specification
 resource "google_api_gateway_api_config" "api_config" {
-  provider             = google-beta # API Gateway is still in beta
+  provider             = google-beta
   api                  = google_api_gateway_api.api.api_id
-  api_config_id_prefix = "api"
+  api_config_id_prefix = "reports-api-config-${var.environment}"
   project              = var.project
-  display_name         = "The ${var.environment} Config"
+  display_name         = "Reports API Config ${var.environment}"
   openapi_documents {
     document {
-      path     = "spec.yaml"             # File name is simply sugar to show on GCP
-      contents = filebase64("spec.yaml") # This is based on *who* is call the module! 
+      path     = "spec.yaml"
+      contents = base64encode(var.spec_yaml)
     }
   }
   gateway_config {
@@ -35,13 +43,13 @@ resource "google_api_gateway_gateway" "gateway" {
   project      = var.project
   region       = var.region
   api_config   = google_api_gateway_api_config.api_config.id
-  gateway_id   = "${var.environment}-gw"
-  display_name = "${var.environment} Api Gateway"
+  gateway_id   = "reports-${var.environment}"
+  display_name = "Reports API Gateway ${var.environment}"
   labels = {
     owner       = "tech_report_api"
     environment = var.environment
   }
-  depends_on = [google_api_gateway_api_config.api_config]
+
   lifecycle {
     replace_triggered_by = [
       google_api_gateway_api_config.api_config
diff --git a/terraform/modules/api-gateway/variables.tf b/terraform/modules/api-gateway/variables.tf
index 6a0f9d0..60ea31e 100644
--- a/terraform/modules/api-gateway/variables.tf
+++ b/terraform/modules/api-gateway/variables.tf
@@ -1,16 +1,23 @@
 variable "environment" {
   description = "The 'Environment' that is being created/deployed. Applied as a suffix to many resources."
   type        = string
+  default     = "dev"
 }
 variable "project" {
   description = "The ID of the project in which the resource belongs. If it is not provided, the provider project is used."
   type        = string
+  default     = "httparchive"
 }
 variable "region" {
   description = "The Region of this resource"
   type        = string
+  default     = "us-central1"
 }
 variable "service_account_email" {
   description = "Email of the service account associated with and to run the API Gateway"
   type        = string
 }
+variable "spec_yaml" {
+  description = "The OpenAPI specification for the API Gateway"
+  type        = string
+}
diff --git a/terraform/modules/run-service/main.tf b/terraform/modules/run-service/main.tf
index 3969282..312e625 100644
--- a/terraform/modules/run-service/main.tf
+++ b/terraform/modules/run-service/main.tf
@@ -1,99 +1,87 @@
+terraform {
+  required_providers {
+    docker = {
+      source  = "kreuzwerker/docker"
+      version = ">= 3.6.2"
+    }
+  }
+}
+
+# Calculate hash of source files to determine if rebuild is needed
 locals {
-  bucketName = "gcf-v2-uploads-226352634162-us-central1"
+  source_files = fileset(path.root, "${var.source_directory}/*")
+  source_hash  = substr(sha1(join("", [for f in local.source_files : filesha1(f)])), 0, 8)
 }
-data "archive_file" "source" {
-  type        = "zip"
-  source_dir  = var.source_directory
-  output_path = "/tmp/${var.function_name}.zip"
+
+# Build Docker image
+resource "docker_image" "function_image" {
+  name = "${var.region}-docker.pkg.dev/${var.project}/tech-report-api/${var.service_name}:${local.source_hash}"
+
+  build {
+    context    = var.source_directory
+    dockerfile = "Dockerfile"
+    platform   = "linux/amd64"
+  }
 }
-resource "google_storage_bucket_object" "zip" {
-  name   = "${var.environment}-${var.function_name}-${data.archive_file.source.output_sha}"
-  bucket = local.bucketName
-  source = data.archive_file.source.output_path
+
+resource "docker_registry_image" "registry_image" {
+  name = docker_image.function_image.name
 }
 
-resource "google_cloudfunctions2_function" "function" {
-  name     = "${var.function_name}-${var.environment}"
+resource "google_cloud_run_v2_service" "service" {
+  name     = "${var.service_name}-${var.environment}"
   location = var.region
 
-  build_config {
-    runtime     = "nodejs22"
-    entry_point = var.entry_point
+  deletion_protection = false
+  ingress             = "INGRESS_TRAFFIC_INTERNAL_LOAD_BALANCER"
 
-    source {
-      storage_source {
-        bucket = local.bucketName
-        object = google_storage_bucket_object.zip.name
+  template {
+    service_account = var.service_account_email
+
+    containers {
+      image = docker_registry_image.registry_image.name
+      resources {
+        limits = {
+          cpu    = var.available_cpu
+          memory = var.available_memory_gb
+        }
+      }
+      dynamic "env" {
+        for_each = var.environment_variables
+        content {
+          name  = env.key
+          value = env.value
+        }
       }
     }
-  }
-
-  service_config {
-    all_traffic_on_latest_revision = true
-    available_memory               = var.available_memory_mb
-    available_cpu                  = var.available_cpu
-    ingress_settings               = var.ingress_settings
-
-    environment_variables = var.environment_variables
-
-    min_instance_count               = var.min_instances
-    max_instance_count               = var.max_instances
-    timeout_seconds                  = var.timeout
+    timeout                          = var.timeout
     max_instance_request_concurrency = var.max_instance_request_concurrency
-    service_account_email            = var.service_account_email
   }
-
+  scaling {
+    min_instance_count = var.min_instances
+  }
+  traffic {
+    type    = "TRAFFIC_TARGET_ALLOCATION_TYPE_LATEST"
+    percent = 100
+  }
   labels = {
     owner       = "tech_report_api"
     environment = var.environment
   }
-
-  depends_on = [
-    google_storage_bucket_object.zip
-  ]
 }
 
-resource "google_cloudfunctions2_function_iam_member" "variable_service_account_function_invoker" {
-  project        = google_cloudfunctions2_function.function.project
-  location       = google_cloudfunctions2_function.function.location
-  cloud_function = google_cloudfunctions2_function.function.name
-  role           = "roles/cloudfunctions.invoker"
-  member         = "serviceAccount:${var.service_account_email}"
-  depends_on     = [google_cloudfunctions2_function.function]
-}
-data "google_cloud_run_service" "run-service" {
-  name       = google_cloudfunctions2_function.function.name
-  location   = var.region
-  depends_on = [google_cloudfunctions2_function.function]
-}
 resource "google_cloud_run_v2_service_iam_member" "variable_service_account_run_invoker" {
   project  = var.project
   location = var.region
-  name     = data.google_cloud_run_service.run-service.name
+  name     = google_cloud_run_v2_service.service.name
   role     = "roles/run.invoker"
   member   = "serviceAccount:${var.service_account_email}"
 }
 
-resource "google_cloudfunctions2_function_iam_member" "api_gw_variable_service_account_function_invoker" {
-  project        = google_cloudfunctions2_function.function.project
-  location       = google_cloudfunctions2_function.function.location
-  cloud_function = google_cloudfunctions2_function.function.name
-  role           = "roles/cloudfunctions.invoker"
-  member     = "serviceAccount:${var.service_account_api_gateway}"
-  depends_on = [google_cloudfunctions2_function.function]
-}
-
 resource "google_cloud_run_v2_service_iam_member" "api_gw_variable_service_account_run_invoker" {
   project  = var.project
   location = var.region
-  name     = data.google_cloud_run_service.run-service.name
+  name     = google_cloud_run_v2_service.service.name
   role     = "roles/run.invoker"
   member   = "serviceAccount:${var.service_account_api_gateway}"
 }
-
-
-
-
-
-
-
diff --git a/terraform/modules/run-service/outputs.tf b/terraform/modules/run-service/outputs.tf
index c7bb95b..c9432ae 100644
--- a/terraform/modules/run-service/outputs.tf
+++ b/terraform/modules/run-service/outputs.tf
@@ -1,5 +1,4 @@
-
 output "name" {
-  description = "Name of the Cloud Function"
-  value       = google_cloudfunctions2_function.function.name
+  description = "Name of the Cloud Run Service"
+  value       = google_cloud_run_v2_service.service.name
 }
diff --git a/terraform/modules/run-service/variables.tf b/terraform/modules/run-service/variables.tf
index 9f77905..659dd0d 100644
--- a/terraform/modules/run-service/variables.tf
+++ b/terraform/modules/run-service/variables.tf
@@ -1,6 +1,3 @@
-variable "secrets" {
-  default = []
-}
 variable "region" {
   default = "us-central1"
   type    = string
@@ -8,20 +5,17 @@ variable "region" {
 variable "environment" {
   description = "The 'Environment' that is being created/deployed. Applied as a suffix to many resources."
   type        = string
+  default     = "dev"
 }
 variable "source_directory" {
   description = "The folder of the package containing function that will be executed when the Google Cloud Function is triggered!"
   type        = string
 }
-variable "function_name" {
+variable "service_name" {
   description = "Optional: Can be used to create more than function from the same package"
   type        = string
 }
-variable "entry_point" {
-  description = "The entry point; This is either what is registered with 'http' or exported from the code as a handler!"
-  type        = string
-}
-variable "available_memory_mb" {
+variable "available_memory_gb" {
   default     = "2Gi"
   type        = string
   description = "The amount of memory for the Cloud Function"
@@ -31,24 +25,15 @@ variable "available_cpu" {
   type        = string
   description = "The amount of CPU for the Cloud Function"
 }
-variable "ingress_settings" {
-  type        = string
-  default     = "ALLOW_ALL"
-  description = "String value that controls what traffic can reach the function. Allowed values are ALLOW_ALL, ALLOW_INTERNAL_AND_GCLB and ALLOW_INTERNAL_ONLY. Check ingress documentation to see the impact of each settings value. Changes to this field will recreate the cloud function."
-}
-variable "vpc_connector_egress_settings" {
-  type        = string
-  default     = null
-  description = "The egress settings for the connector, controlling what traffic is diverted through it. Allowed values are ALL_TRAFFIC and PRIVATE_RANGES_ONLY. Defaults to PRIVATE_RANGES_ONLY. If unset, this field preserves the previously set value."
-}
 variable "project" {
   description = "The ID of the project in which the resource belongs. If it is not provided, the provider project is used."
   type        = string
+  default     = "httparchive"
 }
 variable "timeout" {
-  default     = 60
-  type        = number
-  description = "Timeout (in seconds) for the function. Default value is 60 seconds. Cannot be more than 540 seconds."
+  default     = "60s"
+  type        = string
+  description = "Timeout for the service. Default value is 60 seconds. Cannot be more than 540 seconds."
 }
 variable "service_account_email" {
   type        = string
@@ -58,11 +43,7 @@ variable "service_account_api_gateway" {
   type        = string
   description = "API Gateway service account who can invoke this function. This is required!"
 }
-variable "max_instances" {
-  default     = 10
-  type        = number
-  description = "(Optional) The limit on the maximum number of function instances that may coexist at a given time."
-}
+
 variable "min_instances" {
   description = "(Optional) The limit on the minimum number of function instances that may coexist at a given time."
   type        = number
diff --git a/terraform/prod/local.auto.tfvars.template b/terraform/prod/local.auto.tfvars.template
deleted file mode 100644
index 3ebe52e..0000000
--- a/terraform/prod/local.auto.tfvars.template
+++ /dev/null
@@ -1,4 +0,0 @@
-google_service_account_api_gateway = ""
-google_service_account_cloud_functions = ""
-project_database = ""
-
diff --git a/terraform/prod/main.tf b/terraform/prod/main.tf
index 721b575..48b2fe8 100644
--- a/terraform/prod/main.tf
+++ b/terraform/prod/main.tf
@@ -3,6 +3,12 @@ terraform {
     bucket = "tfstate-httparchive"
     prefix = "tech-report-apis/prod"
   }
+  required_providers {
+    docker = {
+      source  = "kreuzwerker/docker"
+      version = ">= 3.6.2"
+    }
+  }
 }
 
 provider "google" {
@@ -11,23 +17,28 @@ provider "google" {
   request_timeout = "60m"
 }
 
-resource "google_api_gateway_api" "api" {
-  provider     = google-beta
-  api_id       = "reports-api-prod"
-  display_name = "Reports API Gateway PROD"
-  project      = var.project
+provider "google-beta" {
+  project = var.project
+  region  = var.region
+}
+
+# Get current Google Cloud access token
+data "google_client_config" "default" {}
+
+# Configure Docker provider with Artifact Registry authentication
+provider "docker" {
+  registry_auth {
+    address  = "${var.region}-docker.pkg.dev"
+    username = "oauth2accesstoken"
+    password = data.google_client_config.default.access_token
+  }
 }
 
-resource "google_api_gateway_api_config" "api_config" {
-  provider             = google-beta
-  api                  = google_api_gateway_api.api.api_id
-  api_config_id_prefix = "reports-api-config-prod"
-  project              = var.project
-  display_name         = "Reports API Config PROD"
-  openapi_documents {
-    document {
-      path = "spec.yaml"
-      contents = base64encode(<<-EOF
+module "gateway" {
+  source                = "../modules/api-gateway"
+  environment           = var.environment
+  service_account_email = var.google_service_account_api_gateway
+  spec_yaml             = <<EOF
 swagger: "2.0"
 info:
   title: reports_api_config_prod
@@ -106,43 +117,13 @@ paths:
         200:
           description: String
 EOF
-      )
-    }
-  }
-  gateway_config {
-    backend_config {
-      google_service_account = var.google_service_account_api_gateway
-    }
-  }
-}
-
-resource "google_api_gateway_gateway" "gateway" {
-  provider     = google-beta
-  project      = var.project
-  region       = var.region
-  api_config   = google_api_gateway_api_config.api_config.id
-  gateway_id   = "reports-prod"
-  display_name = "Reports API Gateway PROD"
-  labels = {
-    owner       = "tech_report_api"
-    environment = var.environment
-  }
-  depends_on = [google_api_gateway_api_config.api_config]
-  lifecycle {
-    replace_triggered_by = [
-      google_api_gateway_api_config.api_config
-    ]
-  }
 }
 
 module "endpoints" {
-  source                      = "./../modules/run-service"
-  entry_point                 = "app"
-  project                     = var.project
+  source                      = "../modules/run-service"
   environment                 = var.environment
   source_directory            = "../../src"
-  function_name               = "tech-report-api"
-  region                      = var.region
+  service_name               = "tech-report-api"
   service_account_email       = var.google_service_account_cloud_functions
   service_account_api_gateway = var.google_service_account_api_gateway
   min_instances               = var.min_instances
@@ -151,3 +132,18 @@ module "endpoints" {
     "DATABASE" = var.project_database
   }
 }
+
+moved {
+  from = google_api_gateway_api.api
+  to   = module.gateway.google_api_gateway_api.api
+}
+
+moved {
+  from = google_api_gateway_api_config.api_config
+  to   = module.gateway.google_api_gateway_api_config.api_config
+}
+
+moved {
+  from = google_api_gateway_gateway.gateway
+  to   = module.gateway.google_api_gateway_gateway.gateway
+}