diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml
new file mode 100644
index 0000000..263ef48
--- /dev/null
+++ b/.github/workflows/push_trigger.yml
@@ -0,0 +1,22 @@
+name: Build Docker Image
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+    branches:
+      - master
+      - develop
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: docker build . --file DataBreachDetector/Dockerfile --tag databreachdetector:$(date +%s)
diff --git a/Dockerfile b/DataBreachDetector/Dockerfile
similarity index 86%
rename from Dockerfile
rename to DataBreachDetector/Dockerfile
index bb24300..ff6059b 100644
--- a/Dockerfile
+++ b/DataBreachDetector/Dockerfile
@@ -34,7 +34,7 @@ ENV s3-user-key=
 ENV s3-user-secret=
 ENV s3-bucket-name=
 
-COPY requirements.txt .
+COPY DataBreachDetector/requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
-COPY mosipvaluefinder.py .
-CMD ["python", "mosipvaluefinder.py"]
\ No newline at end of file
+COPY DataBreachDetector/databreachdetector.py .
+CMD ["python", "databreachdetector.py"]
\ No newline at end of file
diff --git a/README.md b/DataBreachDetector/README.md
similarity index 100%
rename from README.md
rename to DataBreachDetector/README.md
diff --git a/mosipvaluefinder.py b/DataBreachDetector/databreachdetector.py
similarity index 99%
rename from mosipvaluefinder.py
rename to DataBreachDetector/databreachdetector.py
index 2b3f88a..8d19369 100644
--- a/mosipvaluefinder.py
+++ b/DataBreachDetector/databreachdetector.py
@@ -91,6 +91,7 @@ def deduce_sensitive_data_in_databases():
 
     connection = psycopg2.connect(
         host='postgres.dev.mosip.net',
+        port=5432,
         user='postgres',
         password='mQi298ZW7p',
         database=databases[0]['name']
diff --git a/requirements.txt b/DataBreachDetector/requirements.txt
similarity index 100%
rename from requirements.txt
rename to DataBreachDetector/requirements.txt