diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index bb4f017..e4384df 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -82,6 +82,14 @@ jobs:
         # Pulls minitwit image from Docker Hub and updates the swarm
         run: |
           ssh -i ~/.ssh/ssh_key -o StrictHostKeyChecking=no $SSH_USER@$SSH_LEADER << 'EOF'
+            
+            current_env="${{ needs.set-environment.outputs.current_env }}"
+            case "$current_env" in 
+              production) export STAGE="Production" ;;
+              staging) export STAGE="Staging" ;;
+              *) echo "Unknown environment: $current_env" >&2; exit 1 ;;
+            esac
+            
             export ConnectionStrings__DefaultConnection='${{ secrets.DB_CONNECTIONSTRING }}'
             export DOCKER_USERNAME='${{ secrets.DOCKER_USERNAME }}'
             export STAGE='${{ needs.set-environment.outputs.current_env }}'
diff --git a/.gitignore b/.gitignore
index cb1bb80..72c9c66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -628,8 +628,10 @@ $RECYCLE.BIN/
 # Vim temporary swap files
 *.swp
 
+# Infrastructure related
 csharp-minitwit/Databases/minitwit.db
-infrastructure/secrets*
+infrastructure/secrets-production
+infrastructure/secrets-staging
 infrastructure/ssh_key/*
 infrastructure/.terraform/*
 infrastructure/temp/*
diff --git a/csharp-minitwit/create_droplet.rb b/infrastructure/archive/create_droplet.rb
similarity index 100%
rename from csharp-minitwit/create_droplet.rb
rename to infrastructure/archive/create_droplet.rb
diff --git a/csharp-minitwit/preproduction_vagrantfile b/infrastructure/archive/preproduction_vagrantfile
similarity index 100%
rename from csharp-minitwit/preproduction_vagrantfile
rename to infrastructure/archive/preproduction_vagrantfile
diff --git a/infrastructure/remote_files/deploy.sh b/infrastructure/archive/remote_files/deploy.sh
similarity index 100%
rename from infrastructure/remote_files/deploy.sh
rename to infrastructure/archive/remote_files/deploy.sh
diff --git a/infrastructure/remote_files/docker-compose.yml b/infrastructure/archive/remote_files/docker-compose.yml
similarity index 100%
rename from infrastructure/remote_files/docker-compose.yml
rename to infrastructure/archive/remote_files/docker-compose.yml
diff --git a/infrastructure/remote_files/prometheus.yml b/infrastructure/archive/remote_files/prometheus.yml
similarity index 100%
rename from infrastructure/remote_files/prometheus.yml
rename to infrastructure/archive/remote_files/prometheus.yml
diff --git a/infrastructure/remote_files_preproduction/deploy.sh b/infrastructure/archive/remote_files_preproduction/deploy.sh
similarity index 100%
rename from infrastructure/remote_files_preproduction/deploy.sh
rename to infrastructure/archive/remote_files_preproduction/deploy.sh
diff --git a/infrastructure/remote_files_preproduction/docker-compose.yml b/infrastructure/archive/remote_files_preproduction/docker-compose.yml
similarity index 100%
rename from infrastructure/remote_files_preproduction/docker-compose.yml
rename to infrastructure/archive/remote_files_preproduction/docker-compose.yml
diff --git a/infrastructure/remote_files_preproduction/prometheus.yml b/infrastructure/archive/remote_files_preproduction/prometheus.yml
similarity index 100%
rename from infrastructure/remote_files_preproduction/prometheus.yml
rename to infrastructure/archive/remote_files_preproduction/prometheus.yml
diff --git a/csharp-minitwit/vagrantfile b/infrastructure/archive/vagrantfile
similarity index 100%
rename from csharp-minitwit/vagrantfile
rename to infrastructure/archive/vagrantfile
diff --git a/infrastructure/bootstrap.sh b/infrastructure/bootstrap.sh
index 3ba72f3..dd5b1bd 100755
--- a/infrastructure/bootstrap.sh
+++ b/infrastructure/bootstrap.sh
@@ -18,9 +18,9 @@ fi
 
 echo -e "\n--> Loading environment variables from secrets file\n"
 if [ "$1" = "production" ]; then
-    source secrets
+    source secrets-production
 elif [ "$1" = "staging" ]; then
-    source secrets.staging
+    source secrets-staging
 fi
 
 # Proceed with the script
diff --git a/infrastructure/readme.md b/infrastructure/readme.md
new file mode 100644
index 0000000..7f3d356
--- /dev/null
+++ b/infrastructure/readme.md
@@ -0,0 +1,90 @@
+## Guideline for Using the Provided Terraform and Shell Scripts
+
+### Overview
+The files provided are used for setting up, managing, and tearing down infrastructure with Terraform, specifically for deploying Minitwit. The infrastructure is setup for 2 environments, such as "production" and "staging". This means that based on the environment, it will dynamically create vm's  tailored for each environment. 
+
+#### Files
+- **Terraform Configuration Files (.tf)**: Define the infrastructure for different components like networks, volumes, and providers.
+- **bootstrap.sh**: Script to initialize and deploy /update the Minitwit application.
+- **destroy.sh**: Script to tear down the infrastructure.
+
+#### Infrastructure Components Managed by Terraform
+1. **Swarm Cluster of VMs**:
+    - Creates a total of four droplets: one designated as the leader, two as managers, and one as a worker.
+    - These are orchestrated to work as a Docker Swarm cluster to manage deployments and scaling of the Minitwit application.
+2. **VM Monitoring Server**:
+    - Provisions a single droplet dedicated to monitoring tasks.
+    - Runs Grafana, Prometheus, and Loki inside Docker containers on this server.
+    - Terraform utilizes Grafana provisioner to integrate with the Grafana API for setting up data sources and monitoring dashboards automatically.
+3. **Volume for Monitoring Data**:
+    - Attaches a persistent volume to the monitoring server droplet.
+    - Stores all monitoring data generated by Grafana, Prometheus, and Loki.
+    - Important: As the `destroy.sh` script tears down this volume, it is crucial to back up the data stored on it to prevent loss.
+4. **Reserved IPs**:
+    - Assigns pre-reserved IPs to the swarm leader server and the monitoring server, ensuring stable and consistent access points for these services.
+5. **Terraform State Management**:
+    - Saves the state of the Terraform deployment in Digital Ocean Spaces (compatible with AWS S3), providing a secure and centralized state management solution.
+
+### Required Environment Variables
+
+#### DigitalOcean Configuration
+
+- **`export TF_VAR_do_token=`**: The DigitalOcean API token; this is used to authenticate and interact with DigitalOcean account.
+- **`export SPACE_NAME=`**: The name of the DigitalOcean Space where Terraform state files will be stored.
+- **`export STATE_FILE=`**: The name of the state file within the DigitalOcean Space that Terraform uses to track resource state.
+- **`export AWS_ACCESS_KEY_ID=`**: AWS access key ID, used for accessing AWS services that integrate with DigitalOcean, such as S3-compatible Spaces.
+- **`export AWS_SECRET_ACCESS_KEY=`**:  AWS secret access key
+
+#### Docker Configuration
+- **`export DOCKER_USERNAME=`**:  Docker Hub username, necessary for pulling and managing Docker images possibly stored in private repositories.
+
+#### IP Configuration for VMs
+- **`export TF_VAR_existing_ip=`**: The reserved IP address assigned to the swarm leader server.
+- **`export TF_VAR_grafana_ip=`**: The reserved IP address assigned to the VM that hosts the monitoring services.
+
+### Grafana Related Terraform Configuration
+- **`export TF_VAR_grafana_auth=`**: The authentication string under the format of "user:password" for accessing the Grafana API.
+- **`export TF_VAR_database_name=`**: The name of the database used by Grafana for storing metrics and data.
+- **`export TF_VAR_database_user=`**: The username for accessing the Grafana database.
+- **`export TF_VAR_database_pwd=`**: The password for the database user.
+- **`export TF_VAR_database_url=`**: The URL of the database accessed by Grafana (including the port).
+- **`export TF_VAR_CA_cert_path=`**: The path to the CA certificate file needed for secure database connections (default should be `grafana/ca_cert`). Store the CA certificate contents under the name "ca_cert" inside the following directory `infrastructure/grafana/`. 
+
+#### Database Connection for Bootstrap Script
+- **`export ConnectionStrings__DefaultConnection=`**: The connection string used by the bootstrap script to connect to your application's primary database. This should include credentials, server information, and other necessary details to ensure a successful database connection.
+
+#### Setting Up These Variables
+These environment variables should be set in `secrets-production` or `secrets-staging` files to load environment-specific variables. the files must be saved in the same directory as `bootstrap.sh`. Use `secrets-template` as base to setup the environment variables. Make sure to replace the placeholder values with actual, sensitive data and treat them securely to avoid unauthorized access.
+
+### Step-by-Step Usage Guide
+
+#### 1. Pre-requisites
+- Install Terraform.
+- Ensure you have DO access and secret keys, DO tokens, and any other necessary credentials.
+- Install required CLI tools (e.g. Docker).
+
+#### 2. Initial Setup
+- Clone or download the repository containing the files.
+- Store your secret keys and access tokens in secure files or environment variables as suggested in the scripts.
+
+#### 3. Using `bootstrap.sh` to Deploy Infrastructure
+1. **Prepare Environment Variables:**
+    - Set the necessary environment variables as the script checks these before proceeding.
+    - Configure `secrets` or `secrets.staging` files to load environment-specific variables. the files must be saved in the same directory as `bootstrap.sh`
+1. **Run the Script:**
+    - Execute `bash bootstrap.sh production` or `bash bootstrap.sh staging` depending on the target environment.
+    - The script will initialize Terraform, validate configurations, and apply them to create the infrastructure. It also handles SSH key generation if SSH keys are missing/not provided.
+2. **Post-Deployment:**
+    - The application will be deployed, and the script will output URLs for accessing the Minitwit application and associated monitoring tools.
+
+#### 4. Managing Infrastructure
+- **Modify Terraform Configuration (.tf) Files:**
+    - Adjust the configuration files to scale resources, modify network settings, or integrate additional services.
+    - Run `bash bootstrap.sh production`  or `bash bootstrap.sh staging` to update the infrastructure based on the environment.
+    
+#### 5. Using `destroy.sh` to Tear Down Infrastructure
+1. **Set Required Environment:**
+    - Ensure all environment variables and secrets are correctly set as the script will verify these before proceeding.
+2. **Execute the Script:**
+    - Run `./destroy.sh production` or `./destroy.sh staging`.
+    - This script will remove all the deployed resources and delete the associated Terraform workspace.
\ No newline at end of file
diff --git a/infrastructure/secrets-template b/infrastructure/secrets-template
new file mode 100644
index 0000000..c02a68c
--- /dev/null
+++ b/infrastructure/secrets-template
@@ -0,0 +1,20 @@
+export TF_VAR_do_token=
+export SPACE_NAME=
+export STATE_FILE=
+export AWS_ACCESS_KEY_ID=
+export AWS_SECRET_ACCESS_KEY=
+export DOCKER_USERNAME=
+
+export TF_VAR_existing_ip=
+export TF_VAR_grafana_ip=
+
+# Grafana related terraform configuration
+export TF_VAR_grafana_auth=
+export TF_VAR_database_name=
+export TF_VAR_database_user=
+export TF_VAR_database_pwd=
+export TF_VAR_database_url=
+export TF_VAR_CA_cert_path=
+
+# Connection to the database for bootstrap.sh
+export ConnectionStrings__DefaultConnection=