diff --git a/deploy/k8s/rabbitmq-admin.yaml b/deploy/k8s/rabbitmq-admin.yaml
new file mode 100644
index 00000000..e3ec2d8a
--- /dev/null
+++ b/deploy/k8s/rabbitmq-admin.yaml
@@ -0,0 +1,16 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: rabbitmq-admin
+  namespace: eshop
+  labels:
+    app: eshop
+    service: rabbitmq-admin
+spec:
+  type: NodePort
+  selector:
+    service: rabbitmq
+  ports:
+    - port: 15672
+      nodePort: 31672
+      name: rabbitmq-port
\ No newline at end of file
diff --git a/deploy/k8s/rabbitmq.yaml b/deploy/k8s/rabbitmq.yaml
index 1e7e0763..5097df43 100644
--- a/deploy/k8s/rabbitmq.yaml
+++ b/deploy/k8s/rabbitmq.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: eshop
   labels:
     app: eshop
-    service: redis
+    service: rabbitmq
 spec:
   replicas: 1
   selector:
@@ -25,9 +25,6 @@ spec:
           - name: amqp
             containerPort: 5672
             protocol: TCP
-          - name: http
-            containerPort: 15672
-            protocol: TCP
 ---
 
 kind: Service
@@ -39,17 +36,11 @@ metadata:
     app: eshop
     service: rabbitmq
 spec:
-  type: NodePort
+  type: ClusterIP
   ports:
     - port: 5672
       targetPort: 5672
-      nodePort: 32672
       protocol: TCP
       name: amqp
-    - port: 15672
-      targetPort: 15672
-      nodePort: 32673
-      protocol: TCP
-      name: http  
   selector:
     service: rabbitmq
diff --git a/deploy/k8s/sql-service.yaml b/deploy/k8s/sql-service.yaml
new file mode 100644
index 00000000..93ec4de5
--- /dev/null
+++ b/deploy/k8s/sql-service.yaml
@@ -0,0 +1,16 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: sql-service
+  namespace: eshop
+  labels:
+    app: eshop
+    service: sql-service
+spec:
+  type: NodePort
+  selector:
+    service: sqldb
+  ports:
+    - port: 1433
+      nodePort: 31433
+      name: sql-port
\ No newline at end of file
diff --git a/deploy/k8s/sqlserver.yaml b/deploy/k8s/sqlserver.yaml
index f5aafdfe..dabc3898 100644
--- a/deploy/k8s/sqlserver.yaml
+++ b/deploy/k8s/sqlserver.yaml
@@ -42,11 +42,10 @@ metadata:
     app: eshop
     service: sqldb
 spec:
-  type: NodePort
+  type: ClusterIP
   ports:
     - port: 1433
       targetPort: 1434
-      nodePort: 31433
       protocol: TCP
       name: tds
   selector:
diff --git a/deploy/k8s/start-all.ps1 b/deploy/k8s/start-all.ps1
index f669da7b..38223fbf 100644
--- a/deploy/k8s/start-all.ps1
+++ b/deploy/k8s/start-all.ps1
@@ -1,5 +1,7 @@
 kubectl apply `
     -f ./namespace.yaml `
     -f ./rabbitmq.yaml `
+	-f ./rabbitmq-admin.yaml `
     -f ./redis.yaml `
-    -f ./sqlserver.yaml
\ No newline at end of file
+	-f ./sqlserver.yaml `
+    -f ./sql-service.yaml
\ No newline at end of file
diff --git a/deploy/k8s/stop-all.ps1 b/deploy/k8s/stop-all.ps1
index 38506a61..54abe15c 100644
--- a/deploy/k8s/stop-all.ps1
+++ b/deploy/k8s/stop-all.ps1
@@ -1,5 +1,7 @@
 kubectl delete `
     -f ./namespace.yaml `
     -f ./rabbitmq.yaml `
+	-f ./rabbitmq-admin.yaml `
     -f ./redis.yaml `
-    -f ./sqlserver.yaml
\ No newline at end of file
+	-f ./sqlserver.yaml `
+    -f ./sql-service.yaml
\ No newline at end of file