diff --git a/deploy/firmament-deployment.yaml b/deploy/firmament-deployment.yaml
index 077224fd..57a2ea6e 100644
--- a/deploy/firmament-deployment.yaml
+++ b/deploy/firmament-deployment.yaml
@@ -1,20 +1,36 @@
-apiVersion: extensions/v1beta1
+kind: Service
+apiVersion: v1
+metadata:
+  name: firmament-service
+  namespace: kube-system
+spec:
+  selector:
+    scheduler: firmament
+  ports:
+    - protocol: TCP
+      port: 9090
+      targetPort: 9090
+---
+apiVersion: apps/v1beta1
 kind: Deployment
 metadata:
+  name: firmament-scheduler
+  namespace: kube-system
   labels:
-    app: firmament
-  name: firmament-deployment
+    scheduler: firmament
 spec:
   replicas: 1
   template:
     metadata:
-      labels:
-        app: firmament
-      name: firmament
+      labels: 
+        scheduler: firmament
     spec:
       containers:
-        - name: firmament
-          image: camsas/firmament:dev
-          command: ["/firmament/src/firmament_scheduler", "--flagfile=/firmament/default.conf"]
-          ports:
-             - containerPort: 9090
+      - command: [/firmament/src/firmament_scheduler, --flagfile=/firmament/default.conf, --firmament_scheduler_service_address=0.0.0.0]
+        image: camsas/firmament:dev
+        name: firmament-scheduler
+        ports:
+         - containerPort: 9090
+      hostNetwork: true
+      hostPID: false
+      volumes: []
diff --git a/deploy/poseidon-deployment.yaml b/deploy/poseidon-deployment.yaml
index 2eb3e19a..b7708631 100644
--- a/deploy/poseidon-deployment.yaml
+++ b/deploy/poseidon-deployment.yaml
@@ -1,26 +1,47 @@
-apiVersion: extensions/v1beta1
+kind: Service
+apiVersion: v1
+metadata:
+  name: poseidon-stats
+  namespace: kube-system
+spec:
+  selector:
+    poseidonservice: stats
+  ports:
+    - protocol: TCP
+      port: 9091
+      targetPort: 9091
+---
+apiVersion: apps/v1beta1
 kind: Deployment
 metadata:
   labels:
-    app: poseidon
-  name: poseidon-deployment
+    component: scheduler
+    tier: control-plane
+    poseidonservice: stats
+  name: poseidon
+  namespace: kube-system
 spec:
   replicas: 1
   template:
     metadata:
-      labels:
-        app: poseidon
-      name: poseidon
+      labels: 
+        component: scheduler
+        tier: control-plane
+        version: first
+        poseidonservice: stats
     spec:
       containers:
-        - name: poseidon
-          image: camsas/poseidon:dev
-          command:
-          - poseidon
-          - --logtostderr
-          - --kubeConfig=<path_kubeconfig_file>
-          - --firmamentAddress=<host>:9090
-          - --statsServerAddress=<host>:9091
-          - --kubeVersion=1.5
-          ports:
-             - containerPort: 9091
+      - command: [ /go/bin/poseidon ,--logtostderr ,--kubeConfig="", --firmamentAddress="", --firmamentAddress="", --kubeVersion=="1.6" ]
+        image: camsas/poseidon:dev
+        name: poseidon
+      initContainers:
+      - name: init-firmamentservice
+        image: radial/busyboxplus:curl
+        command: ['sh', '-c', 'until nslookup firmament-service.kube-system; do echo waiting for firmamentservice; sleep 1; done;']
+        securityContext:
+          privileged: false
+        volumeMounts: []
+      hostNetwork: true
+      hostPID: false
+      volumes: []
+
diff --git a/poseidon.go b/poseidon.go
index 5f3552cb..1ba50801 100644
--- a/poseidon.go
+++ b/poseidon.go
@@ -41,10 +41,10 @@ var (
 
 func init() {
 	flag.StringVar(&schedulerName, "schedulerName", "poseidon", "The scheduler name with which pods are labeled")
-	flag.StringVar(&firmamentAddress, "firmamentAddress", "127.0.0.1:9090", "Firmament scheduler service address and port")
+	flag.StringVar(&firmamentAddress, "firmamentAddress", "firmament-service.kube-system:9090", "Firmament scheduler service address and port")
 	flag.StringVar(&kubeConfig, "kubeConfig", "kubeconfig.cfg", "Path to the kubeconfig file")
-	flag.StringVar(&kubeVersion, "kubeVersion", "1.5.6", "Kubernetes version")
-	flag.StringVar(&statsServerAddress, "statsServerAddress", "127.0.0.1:9091", "Address on which the stats server listens")
+	flag.StringVar(&kubeVersion, "kubeVersion", "1.6", "Kubernetes version")
+	flag.StringVar(&statsServerAddress, "statsServerAddress", "0.0.0.0:9091", "Address on which the stats server listens")
 	flag.IntVar(&schedulingInterval, "schedulingInterval", 10, "Time between scheduler runs (in seconds)")
 	flag.Parse()
 }