diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8742a73b2..4f704245e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ build:
     - docker
   stage: build
   script:
-    - git submodule init && git submodule update
+    - git submodule update --init --remote
     - make distclean
     - make -j
   artifacts:
@@ -113,7 +113,7 @@ endurance-test:
     - docker
   stage: test
   script:
-    - git submodule init && git submodule update
+    - git submodule update --init --remote
     - make distclean
     - make -j
     - ./runtest --config server-threads 3 --loop --stop
@@ -125,7 +125,7 @@ coverage-test:
     - docker
   stage: test
   script:
-    - git submodule init && git submodule update
+    - git submodule update --init --remote
     - make distclean
     - make gcov -j
     - make install
diff --git a/pkg/deb/conf/keydb.conf b/pkg/deb/conf/keydb.conf
index 20df32e42..8bf03a0c5 100644
--- a/pkg/deb/conf/keydb.conf
+++ b/pkg/deb/conf/keydb.conf
@@ -261,7 +261,7 @@ tcp-keepalive 300
 
 # By default KeyDB does not run as a daemon. Use 'yes' if you need it.
 # Note that KeyDB will write a pid file in /var/run/keydb.pid when daemonized.
-daemonize no
+daemonize yes
 
 # If you run KeyDB from upstart or systemd, KeyDB can interact with your
 # supervision tree. Options:
@@ -284,7 +284,7 @@ daemonize no
 #
 # Creating a pid file is best effort: if KeyDB is not able to create it
 # nothing bad happens, the server will start and run normally.
-pidfile /var/run/keydb_6379.pid
+pidfile /var/run/keydb/keydb-server.pid
 
 # Specify the server verbosity level.
 # This can be one of: