diff --git a/manifests/contextservice.yaml b/manifests/contextservice.yaml
index fb8b85a317991a508944f772b93247f9491fbefe..1e4d1a6f77a27cc077f7be7c7f6cd6989b9b6964 100644
--- a/manifests/contextservice.yaml
+++ b/manifests/contextservice.yaml
@@ -15,13 +15,13 @@ spec:
       containers:
       - name: server
         image: context:latest
-        imagePullPolicy: Never
+        imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 1010
         env:
         - name: DB_ENGINE
           value: "redis"
-        - name: REDISDB_DATABASE_ID
+        - name: REDIS_DATABASE_ID
           value: "0"
         - name: LOG_LEVEL
           value: "DEBUG"
diff --git a/manifests/deviceservice.yaml b/manifests/deviceservice.yaml
index 4c344cd370cbeadd1b7f22f38f8ffe0c10ee68dc..4b9908425b58e2523bfa5d68af932772b89d9c72 100644
--- a/manifests/deviceservice.yaml
+++ b/manifests/deviceservice.yaml
@@ -15,13 +15,13 @@ spec:
       containers:
       - name: server
         image: device:latest
-        imagePullPolicy: Never
+        imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 2020
         env:
         - name: DB_ENGINE
           value: "redis"
-        - name: REDISDB_DATABASE_ID
+        - name: REDIS_DATABASE_ID
           value: "0"
         - name: LOG_LEVEL
           value: "DEBUG"
diff --git a/src/common/database/engines/redis/RedisDatabaseEngine.py b/src/common/database/engines/redis/RedisDatabaseEngine.py
index b8bad839830ce8a9309100c08a6a29640e0b516c..e8777796823424fc9fd37a691c0616f5915b3dfa 100644
--- a/src/common/database/engines/redis/RedisDatabaseEngine.py
+++ b/src/common/database/engines/redis/RedisDatabaseEngine.py
@@ -13,9 +13,9 @@ def get_setting(settings, name):
 
 class RedisDatabaseEngine(_DatabaseEngine):
     def __init__(self, **settings) -> None:
-        host = get_setting(settings, 'REDISDB_SERVICE_HOST')
-        port = get_setting(settings, 'REDISDB_SERVICE_PORT')
-        dbid = get_setting(settings, 'REDISDB_DATABASE_ID')
+        host = get_setting(settings, 'REDIS_SERVICE_HOST')
+        port = get_setting(settings, 'REDIS_SERVICE_PORT')
+        dbid = get_setting(settings, 'REDIS_DATABASE_ID')
         self._client = Redis.from_url('redis://{host}:{port}/{dbid}'.format(host=host, port=port, dbid=dbid))
         self._mutex = Mutex(self._client)