diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..a54e052
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,11 @@
+FROM python:3.12-slim
+
+COPY requirements.txt .
+
+RUN pip install --no-cache-dir -r requirements.txt
+
+WORKDIR /app
+
+COPY src/ /app/
+
+ENTRYPOINT ["python","main.py"]
diff --git a/README.md b/README.md
index c36483f..fdfb3b4 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,4 @@
 # docker-repository-query
 
 
-## Necessary environment variables saved in .env
-GITHUB_TOKEN=
-
-DOCKER_TOKEN=
-
-DOCKER_USERNAME=
-
-MAIL_ADDRESS=
-
-FROM_ADDRESS=
\ No newline at end of file
+FastAPI service with endpoints that check for updated versions of two applications so far, Suwayomi and Pi-hole.
\ No newline at end of file
diff --git a/query_and_compare.py b/query_and_compare.py
deleted file mode 100644
index 1344537..0000000
--- a/query_and_compare.py
+++ /dev/null
@@ -1,45 +0,0 @@
-from github_api import find_package_version_with_tag as find_package_version_with_tag_github
-from dockerhub_api import find_package_version_with_tag as find_package_version_with_tag_dockerhub
-import os
-import json
-
-def retrieve_state ():
-	default_state = {
-	"suwayomi_id": "",
-	"pihole_id":""
-	}
-	if os.path.exists("state.json"):
-		with open("state.json", "r") as f:
-			return json.load(f)
-	else:
-		state = default_state.copy()
-	return state
-
-def save_state(state):
-	with open("state.json", "w") as f:
-		json.dump(state, f, indent=2)
-
-def check_for_new_suwayomi_version():
-	latest_online_version = find_package_version_with_tag_github("Suwayomi", "tachidesk", "stable")
-	local_state = retrieve_state()
-	if latest_online_version != local_state["suwayomi_id"]:
-		local_state["suwayomi_id"] = latest_online_version
-		save_state(local_state)
-		print("New Suwayomi version has been found")
-		return True
-	print("No new Suwayomi version found")
-	return False
-
-def check_for_new_pihole_version():
-	latest_online_version = find_package_version_with_tag_dockerhub("pihole/pihole", "latest")
-	local_state = retrieve_state()
-	if latest_online_version != local_state["pihole_id"]:
-		local_state["pihole_id"] = latest_online_version
-		save_state(local_state)
-		print("New Pi-hole version has been found")
-		return True
-	print("No new Pi-hole version found")
-	return False
-
-if __name__ == '__main__':
-	check_for_new_pihole_version()
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 90fedef..5ed4fe9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,19 @@
-blinker==1.9.0
-certifi==2025.7.14
-charset-normalizer==3.4.2
-click==8.2.1
-dotenv==0.9.9
-Flask==3.1.1
+annotated-types==0.7.0
+anyio==4.11.0
+certifi==2025.10.5
+charset-normalizer==3.4.3
+click==8.3.0
+fastapi==0.118.2
+h11==0.16.0
 idna==3.10
-itsdangerous==2.2.0
-Jinja2==3.1.6
-MarkupSafe==3.0.2
-python-dotenv==1.1.1
-requests==2.32.4
+mysql-connector-python==9.4.0
+prometheus_client==0.23.1
+pydantic==2.12.0
+pydantic_core==2.41.1
+requests==2.32.5
+sniffio==1.3.1
+starlette==0.48.0
+typing-inspection==0.4.2
+typing_extensions==4.15.0
 urllib3==2.5.0
-Werkzeug==3.1.3
+uvicorn==0.37.0
diff --git a/send_mail.py b/send_mail.py
deleted file mode 100644
index 996cdd1..0000000
--- a/send_mail.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import smtplib
-from email.message import EmailMessage
-from dotenv import load_dotenv
-import os
-
-load_dotenv()
-
-MAIL_ADDRESS = os.getenv("MAIL_ADDRESS")
-FROM_ADDRESS = os.getenv("FROM_ADDRESS", "noreply@localhost")
-
-def send_mail(subject):
-	msg = EmailMessage()
-	msg["From"] = FROM_ADDRESS
-	msg["To"] = MAIL_ADDRESS
-	msg["Subject"] = subject
-	msg.set_content("New Docker image is available")
-
-	with smtplib.SMTP("localhost", 25) as server:
-			server.send_message(msg)
\ No newline at end of file
diff --git a/src/db.py b/src/db.py
new file mode 100644
index 0000000..a11b45f
--- /dev/null
+++ b/src/db.py
@@ -0,0 +1,79 @@
+import mysql.connector
+import threading
+from secret_handler import return_credentials
+import os
+import time
+import sys
+
+db_username = return_credentials("/etc/secrets/db_username")
+db_password = return_credentials("/etc/secrets/db_password")
+db_host = os.getenv("SERVICE_DRQ_DB_HOST","localhost")
+db_database = os.getenv("SERVICE_DRQ_DB_HOST_DATABASE","app")
+
+MAX_RETRIES = 5
+RETRY_DELAY = 5
+
+MYSQL_CONFIG = {
+	"host": db_host,
+	"user": db_username,
+	"password": db_password,
+	"database": db_database
+}
+
+_pool_lock = threading.Lock()
+_connection_pool = None
+
+
+def create_connection_pool():
+	global _connection_pool
+	for attempt in range(1, MAX_RETRIES+1):
+		try:
+			print(f"[MySQL] Attempt {attempt} to connect...")
+			pool  = mysql.connector.pooling.MySQLConnectionPool(
+				pool_name="mypool",
+				pool_size=5,
+				pool_reset_session=True,
+				**MYSQL_CONFIG
+			)
+			with _pool_lock:
+				_connection_pool = pool
+			print("[MySQL] Connection pool created successfully.")
+			return
+		except mysql.connector.Error as e:
+			print(f"[MySQL] Attempt {attempt} failed: {e}")
+			if attempt < MAX_RETRIES:
+				time.sleep(RETRY_DELAY)
+	print(f"[MySQL] Failed to connect after {MAX_RETRIES} attempts — exiting.")
+	sys.exit(1)
+
+
+def close_connection_pool():
+	global _connection_pool
+	with _pool_lock:
+		if _connection_pool:
+			_connection_pool = None
+			print("[MySQL] Connection pool closed.")
+
+
+def get_connection_pool():
+	global _connection_pool
+	with _pool_lock:
+		if _connection_pool is None:
+			create_connection_pool()
+	return _connection_pool
+
+
+def get_db():
+	pool = get_connection_pool()
+	try:
+		conn = pool.get_connection()
+		if not conn.is_connected():
+			conn.reconnect(attempts=MAX_RETRIES, delay=RETRY_DELAY)
+	except Exception:
+		create_connection_pool()
+		pool = get_connection_pool()
+		conn = pool.get_connection()
+	try:
+		yield conn
+	finally:
+		conn.close()
diff --git a/dockerhub_api.py b/src/dockerhub_api.py
similarity index 62%
rename from dockerhub_api.py
rename to src/dockerhub_api.py
index 93a0966..86747e0 100644
--- a/dockerhub_api.py
+++ b/src/dockerhub_api.py
@@ -1,16 +1,16 @@
 import requests
-from dotenv import load_dotenv
-import os
+from secret_handler import return_credentials
 
-load_dotenv()
+dockerhub_token = return_credentials("/etc/secrets/dockerhub_token")
+dockerhub_username = return_credentials("/etc/secrets/dockerhub_username")
 
-DOCKER_TOKEN = os.getenv("DOCKER_TOKEN")
-DOCKER_USERNAME = os.getenv("DOCKER_USERNAME")
-
-def login_and_get_token():
+def login_and_get_token()->str:
+	"""
+	You have to first login with credentials to get a token for subsequent api requests.
+	"""
 	login_url = "https://hub.docker.com/v2/users/login/"
 	response = requests.post(login_url,
-						    json={"username": DOCKER_USERNAME, "password": DOCKER_TOKEN})
+						    json={"username": dockerhub_username, "password": dockerhub_token})
 	if response.status_code == 200:
 		token = response.json()["token"]
 		return token
diff --git a/github_api.py b/src/github_api.py
similarity index 70%
rename from github_api.py
rename to src/github_api.py
index cfcbd1d..a7d44ee 100644
--- a/github_api.py
+++ b/src/github_api.py
@@ -1,15 +1,15 @@
 import requests
-from dotenv import load_dotenv
-import os
+from secret_handler import return_credentials
 
-load_dotenv()
+github_token = return_credentials("/etc/secrets/github_token")
 
-GITHUB_TOKEN = os.getenv("GITHUB_TOKEN")
-
-def find_package_version_with_tag(org , package, target_tag):
-	
+def find_package_version_with_tag(org:str,package:str,target_tag:str)->str:
+	"""
+	Iterates through the available pages looking for the supplied target_tag
+	Either returns None or a string when successful
+	"""
 	headers = {
-		"Authorization": f"Bearer {GITHUB_TOKEN}",
+		"Authorization": f"Bearer {github_token}",
 		"Accept": "application/vnd.github+json"
 	}
 
diff --git a/src/main.py b/src/main.py
new file mode 100644
index 0000000..e201eed
--- /dev/null
+++ b/src/main.py
@@ -0,0 +1,113 @@
+from fastapi import FastAPI, Depends, HTTPException, Response, Request
+import uvicorn
+from github_api import find_package_version_with_tag as find_package_version_with_tag_github
+from dockerhub_api import find_package_version_with_tag as find_package_version_with_tag_dockerhub
+import uvicorn
+from contextlib import asynccontextmanager
+from db import get_db, create_connection_pool, close_connection_pool
+import logging
+from send_notification import send_notification
+from metrics_server import REQUEST_COUNTER
+import asyncio
+
+logger = logging.getLogger(__name__)
+
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+	logger.info("Starting application...")
+
+	logger.info("Creating MySQL connection pool...")
+	create_connection_pool()
+
+	yield
+	logger.info("Closing MySQL connection pool...")
+	close_connection_pool()
+
+api = FastAPI(
+		title="Docker Repository Query",
+		description="Queries Dockerhub and GHCR for new docker images",
+		version="1.0.0",
+		lifespan=lifespan
+)
+
+@api.middleware("http")
+async def prometheus_middleware(request: Request, call_next):
+	try:
+		response = await call_next(request)
+		status = response.status_code
+	except Exception:
+		status = 500
+		raise
+	finally:
+		REQUEST_COUNTER.labels(request.method, request.url.path, status).inc()
+	return response
+
+
+@api.get("/health")
+def return_health():
+	return Response(status_code=200)
+
+
+@api.get("/suwayomi")
+def handle_suwayomi(
+		request: Request,
+		db = Depends(get_db)
+		):
+
+	try:
+		logger.info("Suwayomi handler invoked")
+		latest_online_version = find_package_version_with_tag_github("Suwayomi", "tachidesk", "stable")
+
+		cursor = db.cursor()
+		cursor.execute("SELECT latest_version FROM docker_repositories WHERE app='suwayomi'")
+		local_state = cursor.fetchone()
+
+		if local_state and latest_online_version != local_state[0]:
+			cursor.execute ("UPDATE docker_repositories SET latest_version=%s WHERE app='suwayomi'",
+				    (latest_online_version,))
+			db.commit()
+			logger.info("New Suwayomi version has been found")
+			send_notification("New Suwayomi version has been found")
+			return Response(status_code=200)
+		return Response(status_code=204)
+	except Exception as e:
+		raise HTTPException(status_code=500, detail=str(e))
+
+
+
+@api.get("/pihole")
+def handle_pihole(
+		request: Request,
+		db = Depends(get_db)
+		):
+	try:
+		logger.info("Pi-hole handler invoked")
+		latest_online_version = find_package_version_with_tag_dockerhub("pihole/pihole", "latest")
+		
+		cursor = db.cursor()
+		cursor.execute("SELECT latest_version FROM docker_repositories WHERE app='pihole'")
+		local_state = cursor.fetchone()
+
+		if local_state and latest_online_version != local_state[0]:
+			cursor.execute ("UPDATE docker_repositories SET latest_version=%s WHERE app='pihole'",
+					(latest_online_version,))
+			db.commit()
+			logger.info("New Pi-hole version has been found")
+			send_notification("New Pi-hole version has been found")
+			return Response(status_code=200)
+		return Response(status_code=204)
+	except Exception as e:
+		raise HTTPException(status_code=500, detail=str(e))
+
+
+async def start_servers():
+	config_main = uvicorn.Config("main:api", host="0.0.0.0", port=5000, log_level="info")
+	config_metrics = uvicorn.Config("metrics_server:metrics_api", host="0.0.0.0", port=9000, log_level="info")
+
+	server_main = uvicorn.Server(config_main)
+	server_metrics = uvicorn.Server(config_metrics)
+
+	await asyncio.gather(server_main.serve(), server_metrics.serve())
+
+if __name__ == "__main__":
+	asyncio.run(start_servers())
diff --git a/src/metrics_server.py b/src/metrics_server.py
new file mode 100644
index 0000000..c3fdc9b
--- /dev/null
+++ b/src/metrics_server.py
@@ -0,0 +1,10 @@
+from fastapi import FastAPI, Response
+from prometheus_client import generate_latest, CONTENT_TYPE_LATEST, Counter
+
+metrics_api = FastAPI(title="Metrics Server", description="Prometheus metrics endpoint")
+
+REQUEST_COUNTER = Counter("http_requests_total", "Total HTTP Requests", ["method", "endpoint", "status"])
+
+@metrics_api.get("/metrics")
+async def metrics():
+	return Response(generate_latest(), media_type=CONTENT_TYPE_LATEST)
diff --git a/src/secret_handler.py b/src/secret_handler.py
new file mode 100644
index 0000000..33d66a5
--- /dev/null
+++ b/src/secret_handler.py
@@ -0,0 +1,12 @@
+import sys
+
+def return_credentials(path: str)->str:
+	try:
+		with open (path) as file:
+			return file.read().strip()
+	except FileNotFoundError:
+		print(f"[FATAL] Secret file not found: {path}")
+		sys.exit(1)
+	except Exception as e:
+		print(f"[FATAL] Failed to read secret file {path}: {e}")
+		sys.exit(1)
diff --git a/src/send_notification.py b/src/send_notification.py
new file mode 100644
index 0000000..0df0d1e
--- /dev/null
+++ b/src/send_notification.py
@@ -0,0 +1,35 @@
+import requests
+from requests.exceptions import RequestException, Timeout, ConnectionError, HTTPError
+from secret_handler import return_credentials
+import os
+
+backend_api_url=os.getenv("BACKEND_API_URL","localhost:8101/internal/receive-notifications")
+api_key= return_credentials("/etc/secrets/api_key")
+
+def send_notification(notification:str)->str:
+	headers = {
+		"X-API-Key-Internal": backend_api_url,
+		"Content-Type": "application/json"
+		}
+
+	data = {
+	"receipent_user_id": 1,
+	"message": {
+		"title": notification,
+		"info": "A new version is available.",
+		"link": None
+		}}
+	
+	try:
+		response = requests.post(backend_api_url, headers=headers, json=data)
+		response.raise_for_status()
+		print("Success: Notification sent")
+
+	except Timeout:
+		print("Error: request timed out")
+	except ConnectionError:
+		print("Error: connection failed")
+	except HTTPError as e:
+		print(f"HTTP error: {e.response.status_code} - {e.response.text}")
+	except RequestException as e:
+		print("Request failed:", str(e))
\ No newline at end of file
diff --git a/webserver.py b/webserver.py
deleted file mode 100644
index 7662aed..0000000
--- a/webserver.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from query_and_compare import check_for_new_suwayomi_version,check_for_new_pihole_version
-from flask import Flask
-from send_mail import send_mail
-
-app = Flask(__name__)
-
-@app.route('/suwayomi', methods=['GET'])
-def handle_suwayomi():
-	print("Suwayomi handler invoked")
-	if check_for_new_suwayomi_version():
-		send_mail("New Suwayomi version available")
-	return '', 200
-
-@app.route('/pihole', methods=['GET'])
-def handle_pihole():
-	print("Pi-hole handler invoked")
-	if check_for_new_pihole_version():
-		send_mail("New Pi-hole version available")
-	return '', 200
-
-if __name__ == '__main__':
-	app.run(host='0.0.0.0', port=5000)