diff --git a/Makefile b/Makefile
index ba4725eb..11cd3d7f 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,9 @@ run-camera-simulator:
 run-telegraf:
 	cd telegraf && $(MAKE) run
 
+run-portainer:
+	docker compose -p portainer -f docker-compose-portainer.yml up -d
+
 clean:
 	./clean-containers.sh automated-self-checkout
 
@@ -92,7 +95,10 @@ clean-telegraf:
 clean-webcam:
 	./clean-containers.sh webcam
 
-clean-all: clean clean-ovms clean-simulator clean-results clean-telegraf clean-webcam
+down-portainer:
+	docker compose -p portainer -f docker-compose-portainer.yml down
+
+clean-all: clean clean-ovms clean-simulator clean-results clean-telegraf clean-webcam down-portainer
 
 docs: clean-docs
 	mkdocs build
diff --git a/configs/opencv-ovms/cmd_client/main.go b/configs/opencv-ovms/cmd_client/main.go
index 090ecca1..7a57b6bb 100644
--- a/configs/opencv-ovms/cmd_client/main.go
+++ b/configs/opencv-ovms/cmd_client/main.go
@@ -61,7 +61,7 @@ const (
 	ENV_KEY_VALUE_DELIMITER = "="
 
 	profileLaunchedContainerNameSuffix = "_ovms_pl"
-	defaultGrpcPortFrom                = 9000
+	defaultGrpcPortFrom                = 9001
 
 	scriptDir                = "./scripts"
 	envFileDir               = "./envs"
diff --git a/docker-compose-portainer.yml b/docker-compose-portainer.yml
new file mode 100644
index 00000000..e2893b07
--- /dev/null
+++ b/docker-compose-portainer.yml
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2023 Intel Corporation.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+version: '3.7'
+volumes:
+  portainer_data:
+  
+services:
+  portainer:
+    image:  portainer/portainer-ce
+    ports:
+      - "9000:9000"
+    command: -H unix:///var/run/docker.sock
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:z
+      - portainer_data:/data
+    restart: always
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 6d444c69..54192d9d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,9 @@
-########################################################################
- # Copyright (c) Intel Corporation 2023
- # SPDX-License-Identifier: BSD-3-Clause
-########################################################################
+#
+# Copyright (C) 2023 Intel Corporation.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 
  ## Current Developer Toolbox doesn't support environment files, make sure to remove any files or environment variables starting with $
 version: '3.7'