diff --git a/src/deploy/k8s/deploy-scdf.sh b/src/deploy/k8s/deploy-scdf.sh
index 0ef119b65d..45a3f8e048 100755
--- a/src/deploy/k8s/deploy-scdf.sh
+++ b/src/deploy/k8s/deploy-scdf.sh
@@ -196,8 +196,8 @@ kubectl apply --namespace "$NS" -f "$YAML_PATH/server-config.yaml"
 
 
 kubectl create --namespace "$NS" clusterrolebinding scdftestrole --clusterrole cluster-admin --user=system:serviceaccount:default:scdf-sa
-
-kubectl apply --namespace "$NS" -f "$YAML_PATH/skipper-config-$BROKER.yaml"
+kubectl apply --namespace "$NS" -f "$YAML_PATH/${BROKER}-default-binder.yaml"
+kubectl apply --namespace "$NS" -f "$YAML_PATH/skipper-config.yaml"
 cat "$YAML_PATH/skipper-deployment.yaml" | envsubst '$DATAFLOW_VERSION,$SKIPPER_VERSION,$DATABASE' | kubectl create --namespace "$NS" -f -
 kubectl create --namespace "$NS" -f "$YAML_PATH/skipper-svc.yaml"
 
diff --git a/src/deploy/k8s/yaml/rabbit-default-binder.yaml b/src/deploy/k8s/yaml/rabbit-default-binder.yaml
new file mode 100644
index 0000000000..81c66bb9f5
--- /dev/null
+++ b/src/deploy/k8s/yaml/rabbit-default-binder.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: default-binder
+type: Opaque
+stringData: 
+  spring.cloud.stream.rabbit.binder.nodes[0]: 'rabbitmq:5672'
+
diff --git a/src/deploy/k8s/yaml/server-config.yaml b/src/deploy/k8s/yaml/server-config.yaml
index 7eb79d1057..b4d4c97248 100644
--- a/src/deploy/k8s/yaml/server-config.yaml
+++ b/src/deploy/k8s/yaml/server-config.yaml
@@ -17,7 +17,7 @@ data:
             enabled: false
     maven:
       remoteRepositories:
-        sprinklerRepo: 
+        sprinklerRepo:
           url: https://maven.pkg.github.com/corneil/sprinkler-demos
           username: 'corneil'
           password: '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'
@@ -32,7 +32,7 @@ data:
             imagePullSecret: registry-key
             containerSecurityContext:
               runAsUser:
-        dataflow:          
+        dataflow:
           metrics.dashboard:
             url: 'http://localhost:3000'
           task:
diff --git a/src/deploy/k8s/yaml/skipper-config-kafka.yaml b/src/deploy/k8s/yaml/skipper-config-kafka.yaml
deleted file mode 100644
index 99e06b3a50..0000000000
--- a/src/deploy/k8s/yaml/skipper-config-kafka.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: skipper
-  labels:
-    app: skipper
-data:
-  application-kubernetes.yaml: |-
-    logging:
-      level:
-        root: info
-        org.springframework: debug
-        io.fabric8: debug
-    spring:
-      output:
-        ansi:
-          enabled: NEVER
-      cloud:
-        deployer:
-          kubernetes:
-            imagePullPolicy: IfNotPresent
-            imagePullSecret:
-              -name: registry-key
-        skipper:
-          server:
-            platform:
-              kubernetes:
-                accounts:
-                  default:
-                    imagePullPolicy: IfNotPresent
-                    imagePullSecret:
-                      - name: registry-key
-                    environmentVariables: 'JAVA_TOOL_OPTIONS=-XX:ActiveProcessorCount=-1,LANG=en_US.utf8,LC_ALL=en_US.utf8,JDK_JAVA_OPTIONS=-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8,SPRING_CLOUD_CONFIG_ENABLED=false,SPRING_CLOUD_STREAM_KAFKA_BINDER_BROKERS=kafka-broker:9092,SPRING_CLOUD_STREAM_KAFKA_BINDER_ZK_NODES=${KAFKA_ZK_SERVICE_HOST}:${KAFKA_ZK_SERVICE_PORT}'
-                    request:
-                      memory: 1024Mi
-                      cpu: 1500m
-                    readinessProbeDelay: 1
-                    readinessProbeTimeout: 5
-                    livenessProbeDelay: 1
-                    livenessProbeTimeout: 2
-                    startupProbeDelay: 20
-                    startupProbeTimeout: 5
-                    startupProbeFailure: 50
-    management:
-      defaults:
-        metrics:
-          export:
-            enabled: false
diff --git a/src/deploy/k8s/yaml/skipper-config-rabbit.yaml b/src/deploy/k8s/yaml/skipper-config.yaml
similarity index 89%
rename from src/deploy/k8s/yaml/skipper-config-rabbit.yaml
rename to src/deploy/k8s/yaml/skipper-config.yaml
index 7891e71174..b2ef7d73f7 100644
--- a/src/deploy/k8s/yaml/skipper-config-rabbit.yaml
+++ b/src/deploy/k8s/yaml/skipper-config.yaml
@@ -27,10 +27,11 @@ data:
               kubernetes:
                 accounts:
                   default:
+                    secretRefs: [ default-binder ]
                     imagePullPolicy: IfNotPresent
                     imagePullSecret:
-                      -name: registry-key
-                    environmentVariables: 'JAVA_TOOL_OPTIONS=-XX:ActiveProcessorCount=-1,LANG=en_US.utf8,LC_ALL=en_US.utf8,JDK_JAVA_OPTIONS=-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8,SPRING_CLOUD_CONFIG_ENABLED=false,SPRING_RABBITMQ_HOST=${RABBITMQ_SERVICE_HOST},SPRING_RABBITMQ_PORT=${RABBITMQ_SERVICE_PORT}'
+                      - name: registry-key
+                    environmentVariables: 'JAVA_TOOL_OPTIONS=-XX:ActiveProcessorCount=-1,LANG=en_US.utf8,LC_ALL=en_US.utf8,JDK_JAVA_OPTIONS=-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8,SPRING_CLOUD_CONFIG_ENABLED=false'
                     request:
                       memory: 1024Mi
                       cpu: 1500m