diff --git a/scripts/_common.sh b/scripts/_common.sh
index 5ffdb6ac..406fe699 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -17,45 +17,3 @@ pkg_dependencies="postgresql libgd3 jpegoptim optipng pngquant ffmpeg imagemagic
 #=================================================
 # EXPERIMENTAL HELPERS
 #=================================================
-
-#=================================================
-# REDIS HELPERS
-#=================================================
-
-# get the first available redis database
-#
-# usage: ynh_redis_get_free_db
-# | returns: the database number to use
-ynh_redis_get_free_db() {
-	local result max db
-	result="$(redis-cli INFO keyspace)"
-
-	# get the num
-	max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+")
-
-	db=0
-	# default Debian setting is 15 databases
-	for i in $(seq 0 "$max")
-	do
-	 	if ! echo "$result" | grep -q "db$i"
-	 	then
-			db=$i
-	 		break 1
- 		fi
- 		db=-1
-	done
-
-	test "$db" -eq -1 && ynh_die --message="No available Redis databases..."
-
-	echo "$db"
-}
-
-# Create a master password and set up global settings
-# Please always call this script in install and restore scripts
-#
-# usage: ynh_redis_remove_db database
-# | arg: database - the database to erase
-ynh_redis_remove_db() {
-	local db=$1
-	redis-cli -n "$db" flushall
-}
diff --git a/scripts/install b/scripts/install
index b2a4a6be..852df63f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -7,6 +7,7 @@
 #=================================================
 
 source _common.sh
+source ynh_redis
 source ynh_supervisor
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/remove b/scripts/remove
index 75f33c32..6908d721 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -7,6 +7,7 @@
 #=================================================
 
 source _common.sh
+source ynh_redis
 source ynh_supervisor
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 4a782638..1f78978f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -7,6 +7,7 @@
 #=================================================
 
 source _common.sh
+source ynh_redis
 source ynh_supervisor
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/ynh_redis b/scripts/ynh_redis
new file mode 100644
index 00000000..af5a55c2
--- /dev/null
+++ b/scripts/ynh_redis
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# get the first available redis database
+#
+# usage: ynh_redis_get_free_db
+# | returns: the database number to use
+ynh_redis_get_free_db() {
+    local result max db
+    result="$(redis-cli INFO keyspace)"
+
+    # get the num
+    max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+")
+
+    db=0
+    # default Debian setting is 15 databases
+    for i in $(seq 0 "$max")
+    do
+        if ! echo "$result" | grep -q "db$i"
+        then
+            db=$i
+            break 1
+        fi
+        db=-1
+    done
+
+    test "$db" -eq -1 && ynh_die --message="No available Redis databases..."
+
+    echo "$db"
+}
+
+# Create a master password and set up global settings
+# Please always call this script in install and restore scripts
+#
+# usage: ynh_redis_remove_db database
+# | arg: database - the database to erase
+ynh_redis_remove_db() {
+    local db=$1
+    redis-cli -n "$db" flushall
+}