diff --git a/deployments/deployment.yml b/deployments/deployment.yml
index b2e39d7b60eec8fe9a18da05193cde3287cd2a82..cf1c8bb2f91d6cebfa573a1ade6f1845644bb863 100644
--- a/deployments/deployment.yml
+++ b/deployments/deployment.yml
@@ -1,21 +1,21 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: query-handler-deployment
+  name: query-handler
   labels:
-    app: query-handler 
+    app: query-service
 spec:
   replicas: 1 
   selector:
     matchLabels:
-      app: query-handler
+      app: query-service
   template:
     metadata:
       labels:
-        app: query-handler 
+        app: query-service 
     spec:
       containers:
-      - name: query-handler
+      - name: query-service
         image: datastropheregistry.azurecr.io/query-service:latest
         ports:
         - containerPort: 3000 
@@ -38,11 +38,12 @@ spec:
           value: redis.redis.svc.cluster.local:6379
         - name: LOG_MESSAGES
           value: "true"
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: ARANGO_HOST
-          value: http://arangodb:8529
+        resources:
+            requests:
+              memory: "100Mi"
+              cpu: "100m"
+            limits:
+              memory: "250Mi"
+              cpu: "500m"
       imagePullSecrets:
       - name: docker-regcred
\ No newline at end of file
diff --git a/deployments/hpa.yml b/deployments/hpa.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b440289ed6f1a519a5a844d08f8142c5224eff8f
--- /dev/null
+++ b/deployments/hpa.yml
@@ -0,0 +1,18 @@
+apiVersion: autoscaling/v2beta2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: query-service
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: query-service
+  minReplicas: 1
+  maxReplicas: 3
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: 80
\ No newline at end of file
diff --git a/deployments/svc.yml b/deployments/svc.yml
index 4280c417900298b08e6e276ddb96617c335ccebf..6ede7e67d6ef2c03d81c6302e44d43e3c7557393 100644
--- a/deployments/svc.yml
+++ b/deployments/svc.yml
@@ -2,10 +2,10 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: query-handler-service
+  name: query-service
 spec:
   selector:
-    app: query-handler
+    app: query-service
   ports:
     - port: 3000
       targetPort: 3000
\ No newline at end of file
diff --git a/integration-testing/pod.yml b/integration-testing/pod.yml
index 4da909419da0e66d0bc603362c8709903f6c0d2b..66826a908810542843dc9d00a0c5059a2ae65f0a 100644
--- a/integration-testing/pod.yml
+++ b/integration-testing/pod.yml
@@ -22,7 +22,12 @@ spec:
       value: redis:6379
     - name: LOG_MESSAGES
       value: "true"
-    - name: ARANGO_HOST
-      value: http://arangodb.default.svc.cluster.local:8529
+    resources:
+        requests:
+          memory: "50Mi"
+          cpu: "50m"
+        limits:
+          memory: "100Mi"
+          cpu: "100m"
   imagePullSecrets:
   - name: docker-regcred