diff --git a/services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py b/services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py
index 754565be5dad7b37483533af22b431bc5ed66fa2..67c10dbd3fd280c8d95ba6735f03127ac267c644 100644
--- a/services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py
+++ b/services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py
@@ -131,8 +131,8 @@ to provide help, news and informations on your deployment. Or you can just ignor
             Container.objects.create(user     = None,
                                      name     = 'Minimal Desktop',
                                      description = 'A minimal desktop environment providing basic window management functionalities and a terminal.',
-                                     registry = 'docker.io',
-                                     image_name = 'sarusso/minimaldesktop',
+                                     registry = 'git.ia2.inaf.it:5050',
+                                     image_name = 'exact/swc/minimaldesktop',
                                      image_tag  = 'v0.2.0',
                                      image_arch = 'amd64',
                                      image_os   = 'linux',
@@ -146,9 +146,9 @@ to provide help, news and informations on your deployment. Or you can just ignor
             Container.objects.create(user     = None,
                                      name     = 'Basic Desktop',
                                      description = 'A basic desktop environment. Provides a terminal, a file manager, a web browser and other generic applications.',
-                                     registry = 'docker.io',
-                                     image_name = 'sarusso/basicdesktop',
-                                     image_tag  = 'v0.2.0',
+                                     registry = 'git.ia2.inaf.it:5050',
+                                     image_name = 'exact/swc/basicdesktop',
+                                     image_tag  = 'v0.3.0',
                                      image_arch = 'amd64',
                                      image_os   = 'linux',
                                      interface_port      = '8590',
@@ -163,9 +163,9 @@ to provide help, news and informations on your deployment. Or you can just ignor
             Container.objects.create(user     = None,
                                      name     = 'Jupyter Notebook',
                                      description = 'A Jupyter Notebook server',
-                                     registry = 'docker.io',
-                                     image_name = 'sarusso/jupyternotebook',
-                                     image_tag  = 'v0.2.0',
+                                     registry = 'git.ia2.inaf.it:5050',
+                                     image_name = 'exact/swc/jupyternotebook',
+                                     image_tag  = 'v0.3.0',
                                      image_arch = 'amd64',
                                      image_os   = 'linux',
                                      interface_port      = '8888',
@@ -212,9 +212,9 @@ to provide help, news and informations on your deployment. Or you can just ignor
             Container.objects.create(user     = None,
                                      name     = 'SSH server',
                                      description = 'An SSH server supporting X forwarding as well.',
-                                     registry = 'docker.io',
-                                     image_name = 'sarusso/ssh',
-                                     image_tag  = 'v0.2.0',
+                                     registry = 'git.ia2.inaf.it:5050',
+                                     image_name = 'exact/swc/ssh',
+                                     image_tag  = 'v0.3.0',
                                      image_arch = 'amd64',
                                      image_os   = 'linux',
                                      interface_port     = '22',
@@ -262,6 +262,8 @@ to provide help, news and informations on your deployment. Or you can just ignor
             Computing.objects.create(name = 'Demo Internal',
                                      description = 'A demo internal computing resource.',
                                      type = 'standalone',
+                                     arch = 'amd64',
+                                     supported_archs = ['386'],
                                      access_mode = 'internal',
                                      auth_mode = 'internal',
                                      wms = None,
@@ -272,6 +274,8 @@ to provide help, news and informations on your deployment. Or you can just ignor
             demo_singlenode_computing = Computing.objects.create(name = 'Demo Standalone',
                                                                  description = 'A demo standalone computing resource.',
                                                                  type = 'standalone',
+                                                                 arch = 'amd64',
+                                                                 supported_archs = ['386'],
                                                                  access_mode = 'ssh+cli',
                                                                  auth_mode = 'user_keys',
                                                                  wms = None,
@@ -285,6 +289,8 @@ to provide help, news and informations on your deployment. Or you can just ignor
             demo_slurm_computing = Computing.objects.create(name = 'Demo Cluster',
                                                             description = 'A demo cluster computing resource.',
                                                             type = 'cluster',
+                                                            arch = 'amd64',
+                                                            supported_archs = ['386'],
                                                             access_mode = 'ssh+cli',
                                                             auth_mode = 'user_keys',
                                                             wms = 'slurm',