diff --git a/src/cli/catalog.js b/src/cli/catalog.js
index 155482e72..6dcf1ba95 100644
--- a/src/cli/catalog.js
+++ b/src/cli/catalog.js
@@ -258,11 +258,8 @@ const _createCatalogItemObject = function (catalogItem) {
     ramRequired: catalogItem.ramRequired,
     picture: catalogItem.picture,
     isPublic: AppHelper.validateBooleanCliOptions(catalogItem.public, catalogItem.private),
-    registryId: catalogItem.registryId
-  };
-
-  if (catalogItem.images) {
-    catalogItemObj.images = [
+    registryId: catalogItem.registryId,
+    images: [
       {
         containerImage: catalogItem.x86Image,
         fogTypeId: 1
@@ -271,8 +268,8 @@ const _createCatalogItemObject = function (catalogItem) {
         containerImage: catalogItem.armImage,
         fogTypeId: 2
       }
-    ];
-  }
+    ]
+  };
 
   if (catalogItem.inputType) {
     catalogItemObj.inputType = {
diff --git a/src/services/microservices-service.js b/src/services/microservices-service.js
index ccb069f97..588648ecc 100644
--- a/src/services/microservices-service.js
+++ b/src/services/microservices-service.js
@@ -209,11 +209,11 @@ const _deleteMicroservice = async function (microserviceUuid, microserviceData,
     ?
     {
       uuid: microserviceUuid,
-      userId: user.id
     }
     :
     {
-      uuid: microserviceUuid
+      uuid: microserviceUuid,
+      userId: user.id
     };