diff --git a/CHANGELOG.md b/CHANGELOG.md
index 102c50ba0..ab97ec2ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Move EXE credential generation to a Python script [#1260](https://github.com/greenbone/gvmd/pull/1260) [#1262](https://github.com/greenbone/gvmd/pull/1262)
 - Clarify documentation for --scan-host parameter [#1277](https://github.com/greenbone/gvmd/pull/1277)
 
+### Fixed
+- Use GMP version with leading zero for feed dirs [#1287](https://github.com/greenbone/gvmd/pull/1287)
+
 ### Removed
 - Reduce Severity Classes [#1285](https://github.com/greenbone/gvmd/pull/1285)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a71af1a84..8d2403cb2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,6 +103,7 @@ set (GVMD_SCAP_DATABASE_VERSION 16)
 set (GVMD_CERT_DATABASE_VERSION 6)
 
 set (GMP_VERSION "21.4")
+set (GMP_VERSION_FEED "21.04")
 
 if (SYSCONF_INSTALL_DIR)
   set (SYSCONFDIR "${SYSCONF_INSTALL_DIR}")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d627e0041..674bb0cd8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -307,6 +307,9 @@ endif (NOT CMAKE_BUILD_TYPE MATCHES "Release")
 if (GMP_VERSION)
   add_definitions (-DGMP_VERSION="${GMP_VERSION}")
 endif (GMP_VERSION)
+if (GMP_VERSION_FEED)
+  add_definitions (-DGMP_VERSION_FEED="${GMP_VERSION_FEED}")
+endif (GMP_VERSION_FEED)
 
 add_definitions (-DGVMD_DATABASE_VERSION=${GVMD_DATABASE_VERSION})
 add_definitions (-DGVMD_SCAP_DATABASE_VERSION=${GVMD_SCAP_DATABASE_VERSION})
diff --git a/src/manage_configs.c b/src/manage_configs.c
index 18c70d88e..448af05fa 100644
--- a/src/manage_configs.c
+++ b/src/manage_configs.c
@@ -77,7 +77,7 @@ feed_dir_configs ()
   static gchar *path = NULL;
   if (path == NULL)
     path = g_build_filename (GVMD_FEED_DIR,
-                             GMP_VERSION,
+                             GMP_VERSION_FEED,
                              "configs",
                              NULL);
   return path;
diff --git a/src/manage_migrators.c b/src/manage_migrators.c
index dfa26d94c..b3b25a913 100644
--- a/src/manage_migrators.c
+++ b/src/manage_migrators.c
@@ -2206,7 +2206,7 @@ migrate_232_to_233_set_predefined (const gchar *type, const gchar *table)
   gchar *dir_path;
 
   dir_path = g_build_filename (GVMD_FEED_DIR,
-                               GMP_VERSION,
+                               GMP_VERSION_FEED,
                                type,
                                NULL);
 
diff --git a/src/manage_port_lists.c b/src/manage_port_lists.c
index 735db19bb..2ff4e96cb 100644
--- a/src/manage_port_lists.c
+++ b/src/manage_port_lists.c
@@ -51,7 +51,7 @@ feed_dir_port_lists ()
   static gchar *path = NULL;
   if (path == NULL)
     path = g_build_filename (GVMD_FEED_DIR,
-                             GMP_VERSION,
+                             GMP_VERSION_FEED,
                              "port_lists",
                              NULL);
   return path;
diff --git a/src/manage_report_formats.c b/src/manage_report_formats.c
index 962835bdc..5b7e3f04d 100644
--- a/src/manage_report_formats.c
+++ b/src/manage_report_formats.c
@@ -370,7 +370,7 @@ feed_dir_report_formats ()
   static gchar *path = NULL;
   if (path == NULL)
     path = g_build_filename (GVMD_FEED_DIR,
-                             GMP_VERSION,
+                             GMP_VERSION_FEED,
                              "report_formats",
                              NULL);
   return path;