diff --git a/src/gvmd.c b/src/gvmd.c
index 84f39b2b09..d507993157 100644
--- a/src/gvmd.c
+++ b/src/gvmd.c
@@ -3216,6 +3216,10 @@ gvmd (int argc, char** argv, char *env[])
             type = SCANNER_TYPE_OPENVASD;
           else if (!strcasecmp (scanner_type, "openvasd-sensor"))
             type = SCANNER_TYPE_OPENVASD_SENSOR;
+#ifdef ENABLE_CONTAINER_SCANNING
+          else if (!strcasecmp (scanner_type, "container-image"))
+            type = SCANNER_TYPE_CONTAINER_IMAGE;
+#endif
           else
             {
               type = atoi (scanner_type);
diff --git a/src/manage_sql.c b/src/manage_sql.c
index 7129ac765a..9c72588c61 100644
--- a/src/manage_sql.c
+++ b/src/manage_sql.c
@@ -6446,6 +6446,20 @@ check_db_scanners ()
     }
 #endif
 
+#if ENABLE_CONTAINER_SCANNING
+  if (sql_int ("SELECT count(*) FROM scanners WHERE uuid = '%s';",
+                SCANNER_UUID_CONTAINER_IMAGE_DEFAULT) == 0)
+    {
+      sql ("INSERT INTO scanners"
+        " (uuid, owner, name, host, port, type, ca_pub, credential,"
+        "  creation_time, modification_time)"
+        " VALUES ('" SCANNER_UUID_CONTAINER_IMAGE_DEFAULT "', NULL, "
+        " 'Container Image', '', 0, %d, NULL, NULL, m_now (),"
+        " m_now ());",
+        SCANNER_TYPE_CONTAINER_IMAGE);
+    }
+#endif
+
   if (sql_int ("SELECT count(*) FROM scanners WHERE uuid = '%s';",
                SCANNER_UUID_CVE) == 0)
     sql ("INSERT INTO scanners"
@@ -33698,6 +33712,18 @@ verify_scanner (const char *scanner_id, char **version)
         return 2;
       return 0;
     }
+#endif
+#if ENABLE_CONTAINER_SCANNING
+  else if (scanner_iterator_type (&scanner) == SCANNER_TYPE_CONTAINER_IMAGE)
+    {
+      // Once container scanner is availabe and has version endpoint, replace
+      // this
+      if (version)
+        *version = g_strdup ("TestVersion");
+
+      cleanup_iterator (&scanner);
+      return 0;
+    }
 #endif
   else if (scanner_iterator_type (&scanner) == SCANNER_TYPE_CVE)
     {
@@ -33768,6 +33794,9 @@ manage_get_scanners (GSList *log_config, const db_conn_info_t *database)
           case SCANNER_TYPE_AGENT_CONTROLLER_SENSOR:
             scanner_type_str = "agent-controller-sensor";
             break;
+          case SCANNER_TYPE_CONTAINER_IMAGE:
+            scanner_type_str = "container-image";
+            break;
           default:
             scanner_type_str = NULL;
         }
diff --git a/src/manage_sql.h b/src/manage_sql.h
index 14b3076eba..7b95487bba 100644
--- a/src/manage_sql.h
+++ b/src/manage_sql.h
@@ -103,6 +103,8 @@
  */
 #define SCANNER_UUID_OPENVASD_DEFAULT "8154d8e3-30ee-4959-9151-1863c89a8e62"
 
+#define SCANNER_UUID_CONTAINER_IMAGE_DEFAULT "1facb485-10e8-4520-9110-66f929d9ac2e"
+
 /**
  * @brief UUID of 'CVE' scanner.
  */