diff --git a/Vagrantfile b/Vagrantfile
index 74bbb9bc..6274fc18 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -8,7 +8,7 @@ Vagrant.configure("2") do |config|
   config.vm.network :private_network, ip: '192.168.50.50' # Uncomment to use NFS
   config.vm.synced_folder '.', '/vagrant', nfs: true # Uncomment to use NFS
 
-  config.vm.network "forwarded_port", guest: 2000, host: 2000
+  config.vm.network "forwarded_port", guest: 80, host: 2000
   config.vm.network "forwarded_port", guest: 3000, host: 3000
   config.vm.network "forwarded_port", guest: 8080, host: 8080
   config.vm.network "forwarded_port", guest: 9200, host: 9200
diff --git a/integration/integration_test.sh b/integration/integration_test.sh
index c4c2bcc8..8e953a27 100755
--- a/integration/integration_test.sh
+++ b/integration/integration_test.sh
@@ -27,32 +27,18 @@ echo "Event Counts:"
 echo " - Good: ${good_count}"
 echo " - Bad: ${bad_count}"
 
-stream_enrich_pid_file=/var/run/snowplow_stream_enrich_0.10.0.pid
-stream_collector_pid_file=/var/run/snowplow_stream_collector_0.9.0.pid
-sink_bad_pid_file=/var/run/snowplow_elasticsearch_sink_bad_0.8.0-2x.pid
-sink_good_pid_file=/var/run/snowplow_elasticsearch_sink_good_0.8.0-2x.pid
-
-
-stream_enrich_pid_old="$(cat "${stream_enrich_pid_file}")"
-stream_collector_pid_old="$(cat "${stream_collector_pid_file}")"
-sink_bad_pid_old="$(cat "${sink_bad_pid_file}")"
-sink_good_pid_old="$(cat "${sink_good_pid_file}")"
-
-req_result=$(curl --silent -XPUT 'http://localhost:10000/restart-services')
-
-stream_enrich_pid_new="$(cat "${stream_enrich_pid_file}")"
-stream_collector_pid_new="$(cat "${stream_collector_pid_file}")"
-sink_bad_pid_new="$(cat "${sink_bad_pid_file}")"
-sink_good_pid_new="$(cat "${sink_good_pid_file}")"
+control_plane_dir="/home/ubuntu/snowplow/control-plane"
+#copy control plane directory to /home/ubuntu/snowplow for testing
+sudo cp -r provisioning/resources/control-plane $control_plane_dir
+test_dir="$control_plane_dir/test"
+$test_dir/test.sh $test_dir
+#remove after testing is done
+sudo rm -rf $control_plane_dir
+control_plane_test_res=$?
 
 # Bad Count is 11 due to bad logging
-if [[ "${good_count}" -eq "10" ]] && [[ "${bad_count}" -eq "11" ]] && 
-   [[ "${req_result}" == "OK" ]] &&
-   [[ "${stream_enrich_pid_old}" -ne "${stream_enrich_pid_new}" ]] &&
-   [[ "${stream_collector_pid_old}" -ne "${stream_collector_pid_new}" ]] &&
-   [[ "${sink_bad_pid_old}" -ne "${sink_bad_pid_new}" ]] &&
-   [[ "${sink_good_pid_old}" -ne "${sink_good_pid_new}" ]]; then
-
+if [[ "${good_count}" -eq "10" ]] && [[ "${bad_count}" -eq "11" ]] &&
+   [[ "${control_plane_test_res}" -eq "0" ]]; then
   exit 0
 else
   exit 1
diff --git a/provisioning/resources/configs/Caddyfile b/provisioning/resources/configs/Caddyfile
index b733b6e8..6f59fbdc 100644
--- a/provisioning/resources/configs/Caddyfile
+++ b/provisioning/resources/configs/Caddyfile
@@ -1,4 +1,5 @@
-localhost:2000 {
+*:80 {
+  tls off
   basicauth "USERNAME_PLACEHOLDER" PASSWORD_PLACEHOLDER {
     /home
     /kibana
diff --git a/provisioning/resources/control-plane/snowplow-mini-control-plane-api b/provisioning/resources/control-plane/snowplow-mini-control-plane-api
index 43cb67aa..ec6ee84f 100755
Binary files a/provisioning/resources/control-plane/snowplow-mini-control-plane-api and b/provisioning/resources/control-plane/snowplow-mini-control-plane-api differ
diff --git a/provisioning/resources/control-plane/snowplow-mini-control-plane-api.go b/provisioning/resources/control-plane/snowplow-mini-control-plane-api.go
index 15f19564..764c7095 100644
--- a/provisioning/resources/control-plane/snowplow-mini-control-plane-api.go
+++ b/provisioning/resources/control-plane/snowplow-mini-control-plane-api.go
@@ -20,34 +20,81 @@
 package main
 
 import (
-    "github.com/emicklei/go-restful"
-    "io"
-    "net/http"
-    "log"
-    "os/exec"
-    "flag"
+	"io"
+	"net/http"
+	"log"
+	"os/exec"
+	"os"
+	"flag"
 )
 
 //global variable for script's path
 var scriptsPath string
+var enrichmentsPath string
+var configPath string
 
 func main() {
-    scriptsPathFlag := flag.String("scriptsPath", "", "path for control-plane-api scripts")
-    flag.Parse()
-    scriptsPath = *scriptsPathFlag
-
-    ws := new(restful.WebService)
-    ws.Route(ws.PUT("/restart-services").To(restartSPServices))
-    restful.Add(ws)
-    log.Fatal(http.ListenAndServe(":10000", nil))
+	scriptsPathFlag := flag.String("scriptsPath", "", "path for control-plane-api scripts")
+	enrichmentsPathFlag := flag.String("enrichmentsPath", "", "path for enrichment files")
+	configPathFlag := flag.String("configPath", "", "path for config files")
+	flag.Parse()
+	scriptsPath = *scriptsPathFlag
+	enrichmentsPath = *enrichmentsPathFlag
+	configPath = *configPathFlag
+
+	http.HandleFunc("/restart-services", restartSPServices)
+	http.HandleFunc("/upload-enrichments", uploadEnrichments)
+	log.Fatal(http.ListenAndServe(":10000", nil))
+}
+
+func callRestartSPServicesScript() (string, error){
+	shellScriptCommand := []string{scriptsPath + "/" +  "restart_SP_services.sh"}
+	cmd := exec.Command("/bin/bash", shellScriptCommand...)
+	err := cmd.Run()
+	if err != nil {
+		return "ERR", err
+	}
+	return "OK", err
+}
+
+func restartSPServices(resp http.ResponseWriter, req *http.Request) {
+	if (req.Method == "PUT") {
+		_, err := callRestartSPServicesScript()
+		if err != nil {
+			http.Error(resp, err.Error(), 400)
+			return
+		} else {
+			resp.WriteHeader(http.StatusOK)
+			io.WriteString(resp, "OK")
+		}
+	}
 }
 
-func restartSPServices(req *restful.Request, resp *restful.Response) {
-    cmd := exec.Command("/bin/sh", scriptsPath + "/" +  "restart_SP_services.sh")
-    err := cmd.Run()
-    if err != nil {
-        io.WriteString(resp, "ERR")
-    } else { 
-    	io.WriteString(resp, "OK")
-    }
+func uploadEnrichments(resp http.ResponseWriter, req *http.Request) {
+	if req.Method == "POST" {
+		req.ParseMultipartForm(32 << 20)
+		file, handler, err := req.FormFile("enrichmentjson")
+		if err != nil {
+			http.Error(resp, err.Error(), 400)
+			return
+		}
+		defer file.Close()
+		f, err := os.OpenFile(enrichmentsPath + "/" + handler.Filename, os.O_WRONLY|os.O_CREATE, 0666)
+		if err != nil {
+				http.Error(resp, err.Error(), 400)
+				return
+		}
+		defer f.Close()
+		io.Copy(f, file)
+		//restart SP services to get action the enrichments 
+		_, err = callRestartSPServicesScript()
+		resp.WriteHeader(http.StatusOK)
+		if err != nil {
+			http.Error(resp, err.Error(), 400)
+			return
+		}
+		resp.WriteHeader(http.StatusOK)
+		io.WriteString(resp, "uploaded successfully")
+		return
+	}
 }
diff --git a/provisioning/resources/control-plane/test/test.sh b/provisioning/resources/control-plane/test/test.sh
new file mode 100755
index 00000000..6de7c9e6
--- /dev/null
+++ b/provisioning/resources/control-plane/test/test.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+testDir=$1
+testEnv="$testDir/testEnv"
+testInit="$testDir/testInit"
+
+sudo cp $testInit/snowplow_mini_control_plane_api_test_init /etc/init.d/snowplow_mini_control_plane_api
+sudo /etc/init.d/snowplow_mini_control_plane_api restart $testDir 
+sleep 2
+
+## restart SP services test
+stream_enrich_pid_file=/var/run/snowplow_stream_enrich_0.10.0.pid
+stream_collector_pid_file=/var/run/snowplow_stream_collector_0.9.0.pid
+sink_bad_pid_file=/var/run/snowplow_elasticsearch_sink_bad_0.8.0-2x.pid
+sink_good_pid_file=/var/run/snowplow_elasticsearch_sink_good_0.8.0-2x.pid
+
+
+stream_enrich_pid_old="$(cat "${stream_enrich_pid_file}")"
+stream_collector_pid_old="$(cat "${stream_collector_pid_file}")"
+sink_bad_pid_old="$(cat "${sink_bad_pid_file}")"
+sink_good_pid_old="$(cat "${sink_good_pid_file}")"
+
+req_result=$(curl -s -o /dev/null -w "%{http_code}" -XPUT http://localhost:10000/restart-services)
+
+stream_enrich_pid_new="$(cat "${stream_enrich_pid_file}")"
+stream_collector_pid_new="$(cat "${stream_collector_pid_file}")"
+sink_bad_pid_new="$(cat "${sink_bad_pid_file}")"
+sink_good_pid_new="$(cat "${sink_good_pid_file}")"
+
+if [[ "${req_result}" -eq 200 ]] &&
+   [[ "${stream_enrich_pid_old}" -ne "${stream_enrich_pid_new}" ]] &&
+   [[ "${stream_collector_pid_old}" -ne "${stream_collector_pid_new}" ]] &&
+   [[ "${sink_bad_pid_old}" -ne "${sink_bad_pid_new}" ]] &&
+   [[ "${sink_good_pid_old}" -ne "${sink_good_pid_new}" ]]; then
+
+  echo "Restarting SP services is working correctly."
+else
+  echo "Restarting SP services is not working correctly."
+  exit 1
+fi
+
+
+## upload enrichment test
+upload_enrichments_result=$(curl -s -o /dev/null -w "%{http_code}"  --header "Content-Type: multipart/form-data" -F "enrichmentjson=@$testEnv/orgEnrichments/enrich.json" localhost:10000/upload-enrichments)
+enrichment_diff=$(diff $testEnv/testEnrichments/enrich.json $testEnv/orgEnrichments/enrich.json)
+sleep 2
+
+if [[ "${upload_enrichments_result}" -eq 200 ]] && [[ "${enrichment_diff}" == "" ]];then
+  echo "Uploading enrichment is working correctly."
+else
+  echo "Uploading enrichment is not working correctly."
+  exit 1
+fi
+
+sudo cp $testInit/snowplow_mini_control_plane_api_original_init /etc/init.d/snowplow_mini_control_plane_api
+sudo /etc/init.d/snowplow_mini_control_plane_api restart 
+
+exit 0
diff --git a/provisioning/resources/control-plane/test/testEnv/expectedConfig/Caddyfile_add_domain_name_tls_off b/provisioning/resources/control-plane/test/testEnv/expectedConfig/Caddyfile_add_domain_name_tls_off
new file mode 100644
index 00000000..6f59fbdc
--- /dev/null
+++ b/provisioning/resources/control-plane/test/testEnv/expectedConfig/Caddyfile_add_domain_name_tls_off
@@ -0,0 +1,37 @@
+*:80 {
+  tls off
+  basicauth "USERNAME_PLACEHOLDER" PASSWORD_PLACEHOLDER {
+    /home
+    /kibana
+    /elasticsearch
+    /control-plane
+    /_plugin
+  }
+  redir /home /home/
+  redir /kibana /kibana/
+  redir /iglu-server /iglu-server/
+
+  proxy / localhost:8080
+
+  proxy /home localhost:3000 {
+    without /home
+  }
+
+  proxy /kibana localhost:5601 {
+    without /kibana
+  }
+
+  proxy /iglu-server localhost:8081 {
+    without /iglu-server
+  }
+  proxy /api localhost:8081
+
+  proxy /elasticsearch localhost:9200 {
+    without /elasticsearch
+  }
+  proxy /_plugin localhost:9200
+
+  proxy /control-plane localhost:10000 {
+    without /control-plane
+  }
+}
diff --git a/provisioning/resources/control-plane/test/testEnv/expectedConfig/Caddyfile_add_domain_name_tls_on b/provisioning/resources/control-plane/test/testEnv/expectedConfig/Caddyfile_add_domain_name_tls_on
new file mode 100644
index 00000000..e16241c4
--- /dev/null
+++ b/provisioning/resources/control-plane/test/testEnv/expectedConfig/Caddyfile_add_domain_name_tls_on
@@ -0,0 +1,37 @@
+test.com *:80 {
+  tls example@example.com
+  basicauth "USERNAME_PLACEHOLDER" PASSWORD_PLACEHOLDER {
+    /home
+    /kibana
+    /elasticsearch
+    /control-plane
+    /_plugin
+  }
+  redir /home /home/
+  redir /kibana /kibana/
+  redir /iglu-server /iglu-server/
+
+  proxy / localhost:8080
+
+  proxy /home localhost:3000 {
+    without /home
+  }
+
+  proxy /kibana localhost:5601 {
+    without /kibana
+  }
+
+  proxy /iglu-server localhost:8081 {
+    without /iglu-server
+  }
+  proxy /api localhost:8081
+
+  proxy /elasticsearch localhost:9200 {
+    without /elasticsearch
+  }
+  proxy /_plugin localhost:9200
+
+  proxy /control-plane localhost:10000 {
+    without /control-plane
+  }
+}
diff --git a/provisioning/resources/control-plane/test/testEnv/expectedConfig/Caddyfile_change_username_password b/provisioning/resources/control-plane/test/testEnv/expectedConfig/Caddyfile_change_username_password
new file mode 100644
index 00000000..9aa2485b
--- /dev/null
+++ b/provisioning/resources/control-plane/test/testEnv/expectedConfig/Caddyfile_change_username_password
@@ -0,0 +1,37 @@
+*:80 {
+  tls off
+  basicauth "test_username" "test_password" {
+    /home
+    /kibana
+    /elasticsearch
+    /control-plane
+    /_plugin
+  }
+  redir /home /home/
+  redir /kibana /kibana/
+  redir /iglu-server /iglu-server/
+
+  proxy / localhost:8080
+
+  proxy /home localhost:3000 {
+    without /home
+  }
+
+  proxy /kibana localhost:5601 {
+    without /kibana
+  }
+
+  proxy /iglu-server localhost:8081 {
+    without /iglu-server
+  }
+  proxy /api localhost:8081
+
+  proxy /elasticsearch localhost:9200 {
+    without /elasticsearch
+  }
+  proxy /_plugin localhost:9200
+
+  proxy /control-plane localhost:10000 {
+    without /control-plane
+  }
+}
diff --git a/provisioning/resources/control-plane/test/testEnv/expectedConfig/iglu-resolver-add-super-uuid.json b/provisioning/resources/control-plane/test/testEnv/expectedConfig/iglu-resolver-add-super-uuid.json
new file mode 100644
index 00000000..3d82c927
--- /dev/null
+++ b/provisioning/resources/control-plane/test/testEnv/expectedConfig/iglu-resolver-add-super-uuid.json
@@ -0,0 +1,33 @@
+{
+  "schema": "iglu:com.snowplowanalytics.iglu/resolver-config/jsonschema/1-0-1",
+  "data": {
+    "cacheSize": 500,
+    "repositories": [
+      {
+        "name": "Iglu Central",
+        "priority": 1,
+        "vendorPrefixes": [
+          "com.snowplowanalytics"
+        ],
+        "connection": {
+          "http": {
+            "uri": "http://iglucentral.com"
+          }
+        }
+      },
+      {
+        "name": "Iglu Server",
+        "priority": 0,
+        "vendorPrefixes": [
+          "com.snowplowanalytics"
+        ],
+        "connection": {
+          "http": {
+            "uri": "http://localhost:8081/api",
+            "apikey": "04577adf-6dce-49d7-8cbb-0ffdf83304de"
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/provisioning/resources/control-plane/test/testEnv/expectedConfig/iglu-resolver-external-iglu.json b/provisioning/resources/control-plane/test/testEnv/expectedConfig/iglu-resolver-external-iglu.json
new file mode 100644
index 00000000..29697dc9
--- /dev/null
+++ b/provisioning/resources/control-plane/test/testEnv/expectedConfig/iglu-resolver-external-iglu.json
@@ -0,0 +1,47 @@
+{
+  "schema": "iglu:com.snowplowanalytics.iglu/resolver-config/jsonschema/1-0-1",
+  "data": {
+    "cacheSize": 500,
+    "repositories": [
+      {
+        "name": "Iglu Server",
+        "priority": 0,
+        "vendorPrefixes": [
+          "com.snowplowanalytics"
+        ],
+        "connection": {
+          "http": {
+            "uri": "testigluserveruri.com"
+            "apikey": "PLACEHOLDER"
+          }
+        }
+      },
+
+      {
+        "name": "Iglu Central",
+        "priority": 1,
+        "vendorPrefixes": [
+          "com.snowplowanalytics"
+        ],
+        "connection": {
+          "http": {
+            "uri": "http://iglucentral.com"
+          }
+        }
+      },
+      {
+        "name": "Iglu Server",
+        "priority": 0,
+        "vendorPrefixes": [
+          "com.snowplowanalytics"
+        ],
+        "connection": {
+          "http": {
+            "uri": "http://localhost:8081/api",
+            "apikey": "PLACEHOLDER"
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/provisioning/resources/control-plane/test/testEnv/orgConfig/Caddyfile b/provisioning/resources/control-plane/test/testEnv/orgConfig/Caddyfile
new file mode 100644
index 00000000..6f59fbdc
--- /dev/null
+++ b/provisioning/resources/control-plane/test/testEnv/orgConfig/Caddyfile
@@ -0,0 +1,37 @@
+*:80 {
+  tls off
+  basicauth "USERNAME_PLACEHOLDER" PASSWORD_PLACEHOLDER {
+    /home
+    /kibana
+    /elasticsearch
+    /control-plane
+    /_plugin
+  }
+  redir /home /home/
+  redir /kibana /kibana/
+  redir /iglu-server /iglu-server/
+
+  proxy / localhost:8080
+
+  proxy /home localhost:3000 {
+    without /home
+  }
+
+  proxy /kibana localhost:5601 {
+    without /kibana
+  }
+
+  proxy /iglu-server localhost:8081 {
+    without /iglu-server
+  }
+  proxy /api localhost:8081
+
+  proxy /elasticsearch localhost:9200 {
+    without /elasticsearch
+  }
+  proxy /_plugin localhost:9200
+
+  proxy /control-plane localhost:10000 {
+    without /control-plane
+  }
+}
diff --git a/provisioning/resources/control-plane/test/testEnv/orgConfig/iglu-resolver.json b/provisioning/resources/control-plane/test/testEnv/orgConfig/iglu-resolver.json
new file mode 100644
index 00000000..2b3ef941
--- /dev/null
+++ b/provisioning/resources/control-plane/test/testEnv/orgConfig/iglu-resolver.json
@@ -0,0 +1,33 @@
+{
+  "schema": "iglu:com.snowplowanalytics.iglu/resolver-config/jsonschema/1-0-1",
+  "data": {
+    "cacheSize": 500,
+    "repositories": [
+      {
+        "name": "Iglu Central",
+        "priority": 1,
+        "vendorPrefixes": [
+          "com.snowplowanalytics"
+        ],
+        "connection": {
+          "http": {
+            "uri": "http://iglucentral.com"
+          }
+        }
+      },
+      {
+        "name": "Iglu Server",
+        "priority": 0,
+        "vendorPrefixes": [
+          "com.snowplowanalytics"
+        ],
+        "connection": {
+          "http": {
+            "uri": "http://localhost:8081/api",
+            "apikey": "PLACEHOLDER"
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/provisioning/resources/control-plane/test/testEnv/orgEnrichments/enrich.json b/provisioning/resources/control-plane/test/testEnv/orgEnrichments/enrich.json
new file mode 100644
index 00000000..b36e82fd
--- /dev/null
+++ b/provisioning/resources/control-plane/test/testEnv/orgEnrichments/enrich.json
@@ -0,0 +1,4 @@
+{
+  "test1":"test1",
+  "test2":"test2"
+}
diff --git a/provisioning/resources/control-plane/test/testEnv/testConfig/.gitignore b/provisioning/resources/control-plane/test/testEnv/testConfig/.gitignore
new file mode 100644
index 00000000..be5bc6d6
--- /dev/null
+++ b/provisioning/resources/control-plane/test/testEnv/testConfig/.gitignore
@@ -0,0 +1,2 @@
+Caddyfile
+iglu-resolver.json
diff --git a/provisioning/resources/control-plane/test/testEnv/testEnrichments/.gitignore b/provisioning/resources/control-plane/test/testEnv/testEnrichments/.gitignore
new file mode 100644
index 00000000..4b8dab2d
--- /dev/null
+++ b/provisioning/resources/control-plane/test/testEnv/testEnrichments/.gitignore
@@ -0,0 +1 @@
+enrich.json
diff --git a/provisioning/resources/control-plane/test/testInit/snowplow_mini_control_plane_api_original_init b/provisioning/resources/control-plane/test/testInit/snowplow_mini_control_plane_api_original_init
new file mode 100755
index 00000000..32ef0a48
--- /dev/null
+++ b/provisioning/resources/control-plane/test/testInit/snowplow_mini_control_plane_api_original_init
@@ -0,0 +1,96 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start daemon at boot time
+# Description:       Enable service provided by daemon.
+### END INIT INFO
+
+dir="/home/ubuntu/snowplow/bin/"
+cmd="./snowplow-mini-control-plane-api -scriptsPath=/home/ubuntu/snowplow/scripts/snowplow-mini-control-plane-api-scripts -enrichmentsPath=/home/ubuntu/snowplow/configs/enrichments -configPath=/home/ubuntu/snowplow/configs"
+user=""
+
+name="snowplow_mini_control_plane_api"
+pid_file="/var/run/$name.pid"
+
+get_pid() {
+    cat "$pid_file"
+}
+
+is_running() {
+    [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1
+}
+
+case "$1" in
+    start)
+    if is_running; then
+        echo "Already started"
+    else
+        echo "Starting $name"
+        cd "$dir"
+        if [ -z "$user" ]; then
+            sudo $cmd & 
+        else
+            sudo -u "$user" $cmd &
+        fi
+        echo $! > "$pid_file"
+        if ! is_running; then
+            echo "Unable to start"
+            exit 1
+        fi
+    fi
+    ;;
+    stop)
+    if is_running; then
+        echo -n "Stopping $name.."
+        kill `get_pid`
+        for i in {1..10}
+        do
+            if ! is_running; then
+                break
+            fi
+
+            echo -n "."
+            sleep 1
+        done
+        echo
+
+        if is_running; then
+            echo "Not stopped; may still be shutting down or shutdown may have failed"
+            exit 1
+        else
+            echo "Stopped"
+            if [ -f "$pid_file" ]; then
+                rm "$pid_file"
+            fi
+        fi
+    else
+        echo "Not running"
+    fi
+    ;;
+    restart)
+    $0 stop
+    if is_running; then
+        echo "Unable to stop, will not attempt to start"
+        exit 1
+    fi
+    $0 start
+    ;;
+    status)
+    if is_running; then
+        echo "Running"
+    else
+        echo "Stopped"
+        exit 1
+    fi
+    ;;
+    *)
+    echo "Usage: $0 {start|stop|restart|status}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/provisioning/resources/control-plane/test/testInit/snowplow_mini_control_plane_api_test_init b/provisioning/resources/control-plane/test/testInit/snowplow_mini_control_plane_api_test_init
new file mode 100755
index 00000000..18e78de8
--- /dev/null
+++ b/provisioning/resources/control-plane/test/testInit/snowplow_mini_control_plane_api_test_init
@@ -0,0 +1,97 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start daemon at boot time
+# Description:       Enable service provided by daemon.
+### END INIT INFO
+
+##argument $2 will be test directory. Go one previous directory for accessing control api bin
+dir="$2/.."
+cmd="./snowplow-mini-control-plane-api -scriptsPath=scripts -enrichmentsPath=test/testEnv/testEnrichments -configPath=test/testEnv/testConfig"
+user=""
+
+name="snowplow_mini_control_plane_api"
+pid_file="/var/run/$name.pid"
+
+get_pid() {
+    cat "$pid_file"
+}
+
+is_running() {
+    [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1
+}
+
+case "$1" in
+    start)
+    if is_running; then
+        echo "Already started"
+    else
+        echo "Starting $name"
+        cd "$dir"
+        if [ -z "$user" ]; then
+            sudo $cmd > /dev/null 2>&1 &
+        else
+            sudo -u "$user" $cmd > /dev/null 2>&1 &
+        fi
+        echo $! > "$pid_file"
+        if ! is_running; then
+            echo "Unable to start"
+            exit 1
+        fi
+    fi
+    ;;
+    stop)
+    if is_running; then
+        echo -n "Stopping $name.."
+        kill `get_pid`
+        for i in {1..10}
+        do
+            if ! is_running; then
+                break
+            fi
+
+            echo -n "."
+            sleep 1
+        done
+        echo
+
+        if is_running; then
+            echo "Not stopped; may still be shutting down or shutdown may have failed"
+            exit 1
+        else
+            echo "Stopped"
+            if [ -f "$pid_file" ]; then
+                rm "$pid_file"
+            fi
+        fi
+    else
+        echo "Not running"
+    fi
+    ;;
+    restart)
+    $0 stop
+    if is_running; then
+        echo "Unable to stop, will not attempt to start"
+        exit 1
+    fi
+    $0 start $2
+    ;;
+    status)
+    if is_running; then
+        echo "Running"
+    else
+        echo "Stopped"
+        exit 1
+    fi
+    ;;
+    *)
+    echo "Usage: $0 {start|stop|restart|status}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/provisioning/resources/init/snowplow_mini_control_plane_api b/provisioning/resources/init/snowplow_mini_control_plane_api
index 7fea9374..32ef0a48 100755
--- a/provisioning/resources/init/snowplow_mini_control_plane_api
+++ b/provisioning/resources/init/snowplow_mini_control_plane_api
@@ -10,8 +10,8 @@
 ### END INIT INFO
 
 dir="/home/ubuntu/snowplow/bin/"
-cmd="./snowplow-mini-control-plane-api -scriptsPath=/home/ubuntu/snowplow/scripts/snowplow-mini-control-plane-api-scripts"
-user="ubuntu"
+cmd="./snowplow-mini-control-plane-api -scriptsPath=/home/ubuntu/snowplow/scripts/snowplow-mini-control-plane-api-scripts -enrichmentsPath=/home/ubuntu/snowplow/configs/enrichments -configPath=/home/ubuntu/snowplow/configs"
+user=""
 
 name="snowplow_mini_control_plane_api"
 pid_file="/var/run/$name.pid"
diff --git a/provisioning/resources/ui/js/components/ControlPlane.tsx b/provisioning/resources/ui/js/components/ControlPlane.tsx
index a27a5acf..15e5f9c3 100644
--- a/provisioning/resources/ui/js/components/ControlPlane.tsx
+++ b/provisioning/resources/ui/js/components/ControlPlane.tsx
@@ -29,7 +29,22 @@ export class ControlPlane extends React.Component<{}, {}> {
         <div className="tab-content">        
           <h3>Restart all services:</h3>
           <h4> Clear the cache for iglu schemas </h4>
-          <button type="button" onClick={this.restartAllServices.bind(this) }>Restart all services</button>
+          <button type="button" title="Clear the cache for schemas" onClick={this.restartAllServices.bind(this) }>Restart all services</button>
+        </div>
+        <div className="tab-content">        
+          <h4>Upload enrichments json file:</h4>
+          <form encType="multipart/form-data" action="/controlplane/uploadenrichments" method="post">
+            <table>
+              <tbody>
+                <tr>
+                  <td><input type="file" name="enrichmentjson" /></td>
+                </tr>
+                <tr>
+                  <td><input type="submit" value="upload enrichment json file" /></td>
+                </tr>
+              </tbody>
+            </table>             
+          </form>
         </div>
       </div>
     );