diff --git a/devel/Makefile b/devel/Makefile
index cd7287f..ee5167a 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -8,8 +8,8 @@
 DOCKER_PROJECT     ?= devel
 BOOTSTRAP_PROJECT  ?= develbs
 
-XOS_BOOTSTRAP_PORT ?= 9998
-XOS_UI_PORT        ?= 9999
+XOS_BOOTSTRAP_PORT ?= 9001
+XOS_UI_PORT        ?= 9000
 
 # Include common functions
 include $(COMMON_DIR)/Makefile
diff --git a/devel/docker-compose-bootstrap.yml b/devel/docker-compose-bootstrap.yml
index 548f2e8..d9d7060 100644
--- a/devel/docker-compose-bootstrap.yml
+++ b/devel/docker-compose-bootstrap.yml
@@ -5,11 +5,11 @@
 
 xos_bootstrap_ui:
     image: xosproject/xos
-    command: python /opt/xos/manage.py runserver 0.0.0.0:9998 --insecure --makemigrations
+    command: python /opt/xos/manage.py runserver 0.0.0.0:9001 --insecure --makemigrations
     environment:
         - CONFIG_DIR
     ports:
-        - "9998:9998"
+        - "9001:9001"
     links:
         - xos_db
     volumes:
diff --git a/devel/docker-compose.yml b/devel/docker-compose.yml
index 9ef6fc7..b75f809 100644
--- a/devel/docker-compose.yml
+++ b/devel/docker-compose.yml
@@ -26,9 +26,9 @@
 
 xos:
     image: xosproject/xos
-    command: python /opt/xos/manage.py runserver 0.0.0.0:8000 --insecure --makemigrations
+    command: python /opt/xos/manage.py runserver 0.0.0.0:9000 --insecure --makemigrations
     ports:
-        - "9999:8000"
+        - "9000:9000"
     links:
         - xos_db
     volumes:
diff --git a/devel/xos.m4 b/devel/xos.m4
index cf20886..bacc170 100644
--- a/devel/xos.m4
+++ b/devel/xos.m4
@@ -10,8 +10,8 @@
     xos:
       type: tosca.nodes.XOS
       properties:
-        ui_port: 9999
-        bootstrap_ui_port: 9998
+        ui_port:  9000
+        bootstrap_ui_port:  9001
         docker_project_name: devel
         db_container_name: develbs_xos_db_1
         extra_hosts: ctl:CTLIP