diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index b46ea4c..9d228ef 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,6 +1,21 @@
 {
     "version": "2.0.0",
     "tasks": [
+        {
+            "label": "Build",
+            "type": "shell",
+            "command": "make",
+            "args": ["build"],
+            "options": {
+                "cwd": "${workspaceFolder}"
+                
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": []
+        },
         {
             "label": "Build All",
             "type": "shell",
@@ -97,6 +112,16 @@
             },
             "problemMatcher": []
         },
+        {
+            "label": "Run",
+            "type": "shell",
+            "command": "make",
+            "args": ["run"],
+            "options": {
+                "cwd": "${workspaceFolder}"
+            },
+            "problemMatcher": []
+        },
         {
             "label": "Install",
             "type": "shell",
diff --git a/Makefile b/Makefile
index 5202284..594e181 100644
--- a/Makefile
+++ b/Makefile
@@ -10,13 +10,11 @@ GOARCH := $(shell go env GOARCH)
 
 
 build-all:
-	@echo "\n🏗️ Building all architectures and release modes"
+	@echo "\n🏗️ Building all architectures for ${RELEASE} mode"
 	@echo "🟡 This will build all supported architectures and release combinations. It can take a while...\n"
 
-	GOARCH=amd64 make build
-	GOARCH=arm make build
-	RELEASE=prod make build
-	RELEASE=cloud make build 
+	GOOS=linux GOARCH=amd64 make build
+	GOOS=linux GOARCH=arm make build
 
 	@echo "\n🟢 All builds completed and available at ./bin/ \n"
 
@@ -62,6 +60,10 @@ test:
 test-with-coverage:
 	go test -tags=unit -timeout=600s -v ./... -coverprofile=coverage.out
 
+run:
+	@echo "\n🚀 Running edgeboxctl\n"
+	./bin/edgeboxctl-${GOOS}-${GOARCH}
+
 install:
 	@echo "📦 Installing edgeboxctl service (${RELEASE}) for ${GOOS} (${GOARCH})\n"