diff --git a/docker-compose.yml b/docker-compose.yml
index 3e0e843..9198264 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ zulip:
     - redis
   environment:
     DB_HOST: "database"
-    ZULIP_SETTINGS_MEMCACHED_HOST: "memcached"
+    ZULIP_SETTINGS_MEMCACHED_LOCATION: "memcached:11211"
     ZULIP_SETTINGS_RABBITMQ_HOST: "rabbitmq"
     ZULIP_SECRETS_email_password: "12345"
     ZULIP_SECRETS_rabbitmq_password: "zulip"
diff --git a/entrypoint.sh b/entrypoint.sh
index 1303b70..a3eb12c 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -28,10 +28,7 @@ ZULIP_SETTINGS_RATE_LIMITING="${ZULIP_SETTINGS_RATE_LIMITING:-True}"
 ZULIP_SETTINGS_REDIS_HOST="${ZULIP_SETTINGS_REDIS_HOST:-127.0.0.1}"
 ZULIP_SETTINGS_REDIS_PORT="${ZULIP_SETTINGS_REDIS_PORT:-6379}"
 # Memcached
-ZULIP_SETTINGS_MEMCACHED_HOST="${ZULIP_SETTINGS_MEMCACHED_HOST:-127.0.0.1}"
-ZULIP_SETTINGS_MEMCACHED_HOST_PORT="${ZULIP_SETTINGS_MEMCACHED_HOST_PORT:-11211}"
-ZULIP_SETTINGS_MEMCACHED_LOCATION="${:-$(echo $ZULIP_SETTINGS_MEMCACHED_HOST:$ZULIP_SETTINGS_MEMCACHED_HOST_PORT)}"
-unset ZULIP_SETTINGS_MEMCACHED_HOST ZULIP_SETTINGS_MEMCACHED_HOST_PORT
+ZULIP_SETTINGS_MEMCACHED_LOCATION="${ZULIP_SETTINGS_MEMCACHED_LOCATION:-127.0.0.1:11211}"
 # Nginx settings
 NGINX_WORKERS="${NGINX_WORKERS:-1}"
 NGINX_PROXY_BUFFERING="${NGINX_PROXY_BUFFERING:-off}"
diff --git a/kubernetes/zulip-rc.yml b/kubernetes/zulip-rc.yml
index e494fa6..c5d84c4 100644
--- a/kubernetes/zulip-rc.yml
+++ b/kubernetes/zulip-rc.yml
@@ -10,12 +10,12 @@ spec:
   replicas: 1
   selector:
     version: v1.3.9-1
-    app: gitlab
+    app: zulip
   template:
     metadata:
       labels:
         version: v1.3.9-1
-        app: gitlab
+        app: zulip
     spec:
       containers:
       - name: redis
@@ -74,14 +74,10 @@ spec:
           value: "redis"
         - name: RABBITMQ_HOST
           value: "rabbitmq"
-        - name: ZULIP_USER_EMAIL
-          value: "example@example.com"
-        - name: ZULIP_USER_DOMAIN
-          value: "example.com"
         - name: ZULIP_AUTH_BACKENDS
           value: "EmailAuthBackend"
         - name: ZULIP_SECRETS_email_password
-          value: "12345"
+          value: "123456789"
         - name: ZULIP_SETTINGS_EXTERNAL_HOST
           value: "localhost"
         - name: ZULIP_SETTINGS_ZULIP_ADMINISTRATOR
@@ -96,6 +92,12 @@ spec:
           value: "smtp.example.com"
         - name: ZULIP_SETTINGS_EMAIL_HOST_USER
           value: "noreply@example.com"
+        - name: ZULIP_USER_EMAIL
+          value: "example@example.com"
+        - name: ZULIP_USER_DOMAIN
+          value: "example.com"
+        - name: ZULIP_USER_PASS
+          value: "123456789"
         ports:
         - containerPort: 80
           name: http