diff --git a/.github/test.sh b/.github/test.sh
index b6107a2..2157ce1 100644
--- a/.github/test.sh
+++ b/.github/test.sh
@@ -22,8 +22,8 @@ helm install \
         fluxnetes chart/
 
 # These containers should already be loaded into minikube
-echo "Sleeping 20 seconds waiting for scheduler deploy"
-sleep 20
+echo "Sleeping 1 minute waiting for scheduler deploy"
+sleep 60
 kubectl get pods
 
 # This will get the fluence image (which has scheduler and sidecar), which should be first
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 7d8d9f8..b00f048 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -54,7 +54,7 @@ spec:
       - image: {{ .Values.sidecar.image }}
         imagePullPolicy: {{ .Values.sidecar.pullPolicy }}
         command:
-        - /go/src/fluxnetes/bin/server
+        - /bin/fluxion-service
         - --policy={{ .Values.sidecar.policy }}
         - --port={{ .Values.sidecar.port }}
         {{ if .Values.scheduler.enableExternalService }}- --external-service{{ end }}
diff --git a/src/build/scheduler/Dockerfile b/src/build/scheduler/Dockerfile
index 7e76938..c45ee0b 100644
--- a/src/build/scheduler/Dockerfile
+++ b/src/build/scheduler/Dockerfile
@@ -1,4 +1,4 @@
-FROM fluxrm/flux-sched:jammy
+FROM fluxrm/flux-sched:jammy as builder
 
 USER root
 ENV DEBIAN_FRONTEND=noninteractive
@@ -28,6 +28,9 @@ COPY fluxnetes Makefile /go/src/fluxnetes/
 
 RUN go mod tidy && \
     go mod vendor && \
-    make server FLUX_SCHED_ROOT=/opt/flux-sched && \
-    mkdir -p /home/data/jobspecs /home/data/jgf && \
-    chmod -R ugo+rwx /home/data
\ No newline at end of file
+    make server FLUX_SCHED_ROOT=/opt/flux-sched
+
+FROM ubuntu:jammy
+COPY --from=builder /opt/flux-sched /opt/flux-sched
+COPY --from=builder /go/src/fluxnetes/bin/server /bin/fluxion-service
+RUN  mkdir -p /home/data/jobspecs /home/data/jgf && chmod -R ugo+rwx /home/data
\ No newline at end of file