diff --git a/packages/api/setup.sh b/packages/api/setup.sh
index 31b10c5..ab5ae7b 100755
--- a/packages/api/setup.sh
+++ b/packages/api/setup.sh
@@ -1 +1,5 @@
-echo "Hello from API"
\ No newline at end of file
+#!/bin/bash
+
+source "packages/config-store/.env"
+echo "Fetching API Key with env file from Config Store"
+wget --user $BASIC_USERNAME --password $BASIC_PASSWORD http://127.0.0.1:$CS_PORT/private/api.env -O packages/api/.env
\ No newline at end of file
diff --git a/packages/config-store/.env.example b/packages/config-store/.env.example
new file mode 100644
index 0000000..a2b995f
--- /dev/null
+++ b/packages/config-store/.env.example
@@ -0,0 +1,3 @@
+USERNAME=admin
+PASSWORD=pass
+PORT=0000
diff --git a/packages/config-store/.gitignore b/packages/config-store/.gitignore
new file mode 100644
index 0000000..3e3e04e
--- /dev/null
+++ b/packages/config-store/.gitignore
@@ -0,0 +1,6 @@
+Dockerfile
+.env
+public/*
+private/*
+!public/.gitkeep
+!private/.gitkeep
\ No newline at end of file
diff --git a/packages/config-store/Dockerfile b/packages/config-store/Dockerfile.example
similarity index 66%
rename from packages/config-store/Dockerfile
rename to packages/config-store/Dockerfile.example
index 9d17968..66328f4 100644
--- a/packages/config-store/Dockerfile
+++ b/packages/config-store/Dockerfile.example
@@ -8,5 +8,6 @@ RUN go get
 
 RUN go build
 
-CMD ["config-store"]
+EXPOSE 0000
 
+CMD ["/app/config-store"]
\ No newline at end of file
diff --git a/packages/config-store/main.go b/packages/config-store/main.go
index e3ae2a4..b877777 100644
--- a/packages/config-store/main.go
+++ b/packages/config-store/main.go
@@ -70,7 +70,7 @@ func main() {
 
 	app.Static("/private", "private")
 
-	port := goDotEnvVariable("PORT")
+	port := goDotEnvVariable("CS_PORT")
 	if port == "" {
 		port = "3000"
 	}
diff --git a/packages/config-store/setup.sh b/packages/config-store/setup.sh
index 54a2a9d..9fa4691 100755
--- a/packages/config-store/setup.sh
+++ b/packages/config-store/setup.sh
@@ -14,5 +14,7 @@ echo "BASIC_USERNAME=$username" >> $ENV_PATH
 echo "BASIC_PASSWORD=$password" >> $ENV_PATH
 echo "PORT=$port" >> $ENV_PATH
 
+sed "s/0000/$port/g" packages/config-store/Dockerfile.example > packages/config-store/Dockerfile
+
 # Echo a message to confirm the file has been saved
 echo "Configuration saved to packages/config-store/.env"
diff --git a/scripts/setup.sh b/scripts/setup.sh
index e5cba85..df1c4b8 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -12,21 +12,28 @@ echo ""
 echo "This script will setup .env all the packages in the $PACKAGES_FOLDER folder."
 echo ""
 
+# Ask If setting up for the first time, then only setup "config-store" package
+read -p "Is this the first time you are setting up the project? [y/N] " -n 1 -r
+echo ""
+if [[ $REPLY =~ ^[Yy]$ ]]; then
+  echo "${bold} Setting up config-store ${normal}"
+  bash packages/config-store/setup.sh
+  echo ""
+  exit 0
+fi
+
 # Iterate through all packages
 for package in $PACKAGES_FOLDER/*; do
   # Check if package is a directory
-
-    echo "${bold} Setting up $package ${normal}"
+  echo "${bold} Setting up $package ${normal}"
 
   if [ -d "$package" ]; then
-
     # Check if .setup file is present. If not, skip package
     if [ ! -f "$package/.setup" ]; then
       echo "Skipping $package"
       echo ""
       continue
     fi
-
     # Check if .env file presen. If present, ask user if  he wants to overwrite it
     if [ -f "$package/.env" ]; then
       read -p "Overwrite $package/.env? [y/N] " -n 1 -r
@@ -36,10 +43,8 @@ for package in $PACKAGES_FOLDER/*; do
         continue
       fi
     fi
-
     chmod +x "$package/setup.sh"
     bash "$package/setup.sh"
-
     echo ""
   fi
 done