diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6364978..ec643ee 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,6 +27,6 @@ jobs:
       - name: Lint
         run: |
           flake8
-      - name: Run tests
+      - name: Run unit tests
         run: |
-          pytest -q || true
+          pytest tests/unit -q
diff --git a/dev-requirements.txt b/dev-requirements.txt
index ef02bb0..70ed708 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -10,3 +10,4 @@ ipython
 line-profiler-pycharm==1.1.0
 line-profiler==4.0.3
 flake8
+moto
diff --git a/env.py b/env.py
index 1870173..85d7f17 100644
--- a/env.py
+++ b/env.py
@@ -1,2 +1,20 @@
-BUCKET_NAME = 'static.netwrck.com'
-BUCKET_PATH = 'static/uploads'
+import os
+
+# Storage provider can be 'r2' or 'gcs'. Default to R2 as it is generally
+# cheaper and provides S3 compatible APIs.
+STORAGE_PROVIDER = os.getenv("STORAGE_PROVIDER", "r2").lower()
+
+# Name of the bucket to upload to. This bucket should be accessible via the
+# public domain as configured in your cloud provider.
+BUCKET_NAME = os.getenv("BUCKET_NAME", "netwrckstatic.netwrck.com")
+
+# Path prefix inside the bucket where files are stored.
+BUCKET_PATH = os.getenv("BUCKET_PATH", "static/uploads")
+
+# Endpoint URL for R2/S3 compatible storage. For Cloudflare R2 this usually
+# looks like `https://<accountid>.r2.cloudflarestorage.com`.
+R2_ENDPOINT_URL = os.getenv("R2_ENDPOINT_URL", "https://netwrckstatic.netwrck.com")
+
+# Base public URL to prefix returned links. Defaults to the bucket name which
+# assumes a custom domain is configured.
+PUBLIC_BASE_URL = os.getenv("PUBLIC_BASE_URL", BUCKET_NAME)
diff --git a/readme.md b/readme.md
index f1fdeb1..cb8a9b2 100644
--- a/readme.md
+++ b/readme.md
@@ -7,7 +7,8 @@ Welcome to Simple Stable Diffusion Server, your go-to solution for AI-powered im
 ## Features
 
 - **Local Deployment**: Run locally for style transfer, art generation and inpainting.
-- **Production Mode**: Save images to cloud storage and retrieve links to Google Cloud Storage.
+- **Production Mode**: Save images to cloud storage. By default files are uploaded
+  to an R2 bucket via the S3 API, but Google Cloud Storage remains supported.
 - **Versatile Applications**: Perfect for AI art generation, style transfer, and image inpainting. Bring any SDXL/diffusers model.
 - **Easy to Use**: Simple interface for generating images in Gradio locally and easy to use FastAPI docs/server for advanced users.
 
@@ -59,18 +60,38 @@ http://127.0.0.1:7860
 
 ## Server setup
 #### Edit settings
-#### download your Google cloud credentials to secrets/google-credentials.json
-Images generated will be stored in your bucket
+#### Configure storage credentials
+By default the server uploads to an R2 bucket using S3 compatible credentials.
+Set the following environment variables if you need to customise the backend:
+
+```
+STORAGE_PROVIDER=r2            # or 'gcs'
+BUCKET_NAME=netwrckstatic.netwrck.com
+BUCKET_PATH=static/uploads
+R2_ENDPOINT_URL=https://<account>.r2.cloudflarestorage.com
+PUBLIC_BASE_URL=netwrckstatic.netwrck.com
+```
+
+When using Google Cloud Storage you must also provide the service account
+credentials as shown below.
+
+To upload a file manually you can use the helper script:
+
+```bash
+python scripts/upload_file.py local.png uploads/example.png
+```
 
 #### Run the server
 
 ```bash
-GOOGLE_APPLICATION_CREDENTIALS=secrets/google-credentials.json gunicorn  -k uvicorn.workers.UvicornWorker -b :8000 main:app --timeout 600 -w 1 
+GOOGLE_APPLICATION_CREDENTIALS=secrets/google-credentials.json \
+    gunicorn -k uvicorn.workers.UvicornWorker -b :8000 main:app --timeout 600 -w 1
 ```
 with max 4 requests at a time
 This will drop a lot of requests under load instead of taking on too much work and causing OOM Errors.
 ```bash
-GOOGLE_APPLICATION_CREDENTIALS=secrets/google-credentials.json PYTHONPATH=. uvicorn --port 8000 --timeout-keep-alive 600 --workers 1 --backlog 1 --limit-concurrency 4 main:app
+GOOGLE_APPLICATION_CREDENTIALS=secrets/google-credentials.json \
+    PYTHONPATH=. uvicorn --port 8000 --timeout-keep-alive 600 --workers 1 --backlog 1 --limit-concurrency 4 main:app
 ```
 
 #### Make a Request
@@ -79,7 +100,7 @@ http://localhost:8000/create_and_upload_image?prompt=good%20looking%20elf%20fant
 
 Response
 ```shell
-{"path":"https://storage.googleapis.com/static.netwrck.com/static/uploads/created/elf.png"}
+{"path":"https://netwrckstatic.netwrck.com/static/uploads/created/elf.png"}
 ```
 
 http://localhost:8000/swagger-docs
@@ -87,13 +108,14 @@ http://localhost:8000/swagger-docs
 
 Check to see that "good Looking elf fantasy character" was created
 
-![elf.png](https://storage.googleapis.com/static.netwrck.com/static/uploads/aiamazing-good-looking-elf-fantasy-character-awesome-portrait-2.webp)
+![elf.png](https://netwrckstatic.netwrck.com/static/uploads/aiamazing-good-looking-elf-fantasy-character-awesome-portrait-2.webp)
 ![elf2.png](https://github.com/Netwrck/stable-diffusion-server/assets/2122616/81e86fb7-0419-4003-a67a-21470df225ea)
 
 ### Testing
 
+Run the unit tests with:
 ```bash
-GOOGLE_APPLICATION_CREDENTIALS=secrets/google-credentials.json pytest .
+GOOGLE_APPLICATION_CREDENTIALS=secrets/google-credentials.json pytest tests/unit
 ```
 
 
diff --git a/requirements.in b/requirements.in
index b8a5052..def82e9 100644
--- a/requirements.in
+++ b/requirements.in
@@ -48,6 +48,7 @@ uvicorn
 zipp
 jinja2
 loguru
+boto3
 
 google-api-python-client
 google-api-core #1.31.5
diff --git a/requirements.txt b/requirements.txt
index 409b6fa..c1da90e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -32,6 +32,12 @@ attrs==24.2.0
     #   referencing
 blinker==1.9.0
     # via streamlit
+boto3==1.39.3
+    # via -r requirements.in
+botocore==1.39.3
+    # via
+    #   boto3
+    #   s3transfer
 cachetools==5.5.0
     # via
     #   -r requirements.in
@@ -222,6 +228,10 @@ jinja2==3.1.4
     #   gradio
     #   pydeck
     #   torch
+jmespath==1.0.1
+    # via
+    #   boto3
+    #   botocore
 joblib==1.4.2
     # via
     #   nltk
@@ -422,6 +432,7 @@ pyparsing==3.2.0
     #   matplotlib
 python-dateutil==2.9.0.post0
     # via
+    #   botocore
     #   google-cloud-bigquery
     #   matplotlib
     #   pandas
@@ -477,6 +488,8 @@ rpds-py==0.21.0
     #   referencing
 rsa==4.9
     # via google-auth
+s3transfer==0.13.0
+    # via boto3
 sacremoses==0.1.1
     # via transformers
 safetensors==0.4.5
@@ -567,6 +580,7 @@ uritemplate==4.1.1
 urllib3==2.2.3
     # via
     #   -r requirements.in
+    #   botocore
     #   requests
 uvicorn==0.32.1
     # via
diff --git a/scripts/upload_file.py b/scripts/upload_file.py
new file mode 100644
index 0000000..5fa2943
--- /dev/null
+++ b/scripts/upload_file.py
@@ -0,0 +1,17 @@
+import argparse
+from stable_diffusion_server.bucket_api import upload_to_bucket
+
+parser = argparse.ArgumentParser(description="Upload a file to the configured bucket")
+parser.add_argument("source", help="Local file path")
+parser.add_argument("dest", help="Destination key inside bucket")
+parser.add_argument("--bytes", action="store_true", help="Treat source as BytesIO")
+
+args = parser.parse_args()
+
+if args.bytes:
+    with open(args.source, "rb") as f:
+        data = f.read()
+    url = upload_to_bucket(args.dest, data, is_bytesio=True)
+else:
+    url = upload_to_bucket(args.dest, args.source)
+print(url)
diff --git a/stable_diffusion_server/bucket_api.py b/stable_diffusion_server/bucket_api.py
index 950f755..b2cee3c 100644
--- a/stable_diffusion_server/bucket_api.py
+++ b/stable_diffusion_server/bucket_api.py
@@ -1,28 +1,79 @@
+"""Abstraction layer for cloud bucket uploads.
+
+This module supports both Google Cloud Storage (GCS) and any S3 compatible
+storage such as Cloudflare R2. The storage backend is selected via the
+``STORAGE_PROVIDER`` environment variable defined in :mod:`env`.
+"""
+
 import cachetools
 from cachetools import cached
-from google.cloud import storage
 from PIL.Image import Image
-from env import BUCKET_NAME, BUCKET_PATH
 
-storage_client = storage.Client()
-bucket_name = BUCKET_NAME  # Do not put 'gs://my_bucket_name'
-bucket = storage_client.bucket(bucket_name)
+from env import (
+    STORAGE_PROVIDER,
+    BUCKET_NAME,
+    BUCKET_PATH,
+    R2_ENDPOINT_URL,
+    PUBLIC_BASE_URL,
+)
+
+storage_client = None
+bucket = None
+s3_client = None
+bucket_name = BUCKET_NAME
 bucket_path = BUCKET_PATH
 
+
+def init_storage():
+    """Initialise global storage clients based on environment variables."""
+    global storage_client, bucket, s3_client, bucket_name, bucket_path
+    bucket_name = BUCKET_NAME
+    bucket_path = BUCKET_PATH
+
+    if STORAGE_PROVIDER == "gcs":
+        from google.cloud import storage
+
+        storage_client = storage.Client()
+        bucket = storage_client.bucket(bucket_name)
+    else:
+        import boto3
+
+        session = boto3.session.Session()
+        s3_client = session.client("s3", endpoint_url=R2_ENDPOINT_URL)
+
+
+init_storage()
+
 @cached(cachetools.TTLCache(maxsize=10000, ttl=60 * 60 * 24))
 def check_if_blob_exists(name: object) -> object:
-    stats = storage.Blob(bucket=bucket, name=get_name_with_path(name)).exists(storage_client)
-    return stats
+    if STORAGE_PROVIDER == "gcs":
+        stats = storage.Blob(bucket=bucket, name=get_name_with_path(name)).exists(storage_client)
+        return stats
+    else:
+        try:
+            s3_client.head_object(Bucket=bucket_name, Key=get_name_with_path(name))
+            return True
+        except s3_client.exceptions.ClientError as exc:  # type: ignore[attr-defined]
+            if exc.response.get("Error", {}).get("Code") == "404":
+                return False
+            raise
 
 def upload_to_bucket(blob_name, path_to_file_on_local_disk, is_bytesio=False):
-    """ Upload data to a bucket"""
-    blob = bucket.blob(get_name_with_path(blob_name))
-    if not is_bytesio:
-        blob.upload_from_filename(path_to_file_on_local_disk)
+    """Upload data to a bucket and return the public URL."""
+    key = get_name_with_path(blob_name)
+    if STORAGE_PROVIDER == "gcs":
+        blob = bucket.blob(key)
+        if not is_bytesio:
+            blob.upload_from_filename(path_to_file_on_local_disk)
+        else:
+            blob.upload_from_string(path_to_file_on_local_disk, content_type="image/webp")
+        return blob.public_url
     else:
-        blob.upload_from_string(path_to_file_on_local_disk, content_type='image/webp')
-    #returns a public url
-    return blob.public_url
+        if not is_bytesio:
+            s3_client.upload_file(path_to_file_on_local_disk, bucket_name, key, ExtraArgs={"ACL": "public-read"})
+        else:
+            s3_client.put_object(Bucket=bucket_name, Key=key, Body=path_to_file_on_local_disk, ACL="public-read", ContentType="image/webp")
+        return f"https://{PUBLIC_BASE_URL}/{key}"
 
 
 def get_name_with_path(blob_name):
diff --git a/tests/test_health.py b/tests/integ/test_health.py
similarity index 73%
rename from tests/test_health.py
rename to tests/integ/test_health.py
index a33b51c..0211f5e 100644
--- a/tests/test_health.py
+++ b/tests/integ/test_health.py
@@ -1,4 +1,8 @@
+import pytest
 from fastapi.testclient import TestClient
+
+pytestmark = pytest.mark.skip(reason="requires heavy model imports")
+
 from main import app
 
 client = TestClient(app)
diff --git a/tests/test_main.py b/tests/integ/test_main.py
similarity index 95%
rename from tests/test_main.py
rename to tests/integ/test_main.py
index 87971ae..c728bbf 100644
--- a/tests/test_main.py
+++ b/tests/integ/test_main.py
@@ -2,12 +2,17 @@
 
 import pillow_avif
 assert pillow_avif
+
+import pytest
 from main import (
     create_image_from_prompt,
     inpaint_image_from_prompt,
     style_transfer_image_from_prompt,
 )
 
+# These tests require heavy models and are skipped in lightweight CI environments.
+pytestmark = pytest.mark.skip(reason="requires heavy stable diffusion models")
+
 
 def test_create_image_from_prompt_sync():
     imagebytesresult = create_image_from_prompt("a test prompt", 512, 512)
diff --git a/tests/test_main_server.py b/tests/integ/test_main_server.py
similarity index 95%
rename from tests/test_main_server.py
rename to tests/integ/test_main_server.py
index 55f781b..8cac6bb 100644
--- a/tests/test_main_server.py
+++ b/tests/integ/test_main_server.py
@@ -1,10 +1,13 @@
+import os
 import pytest
 from fastapi.testclient import TestClient
+from moto import mock_s3
+
 from main import app
-import os
 
 client = TestClient(app)
 
+@pytest.mark.skip(reason="requires heavy model and long runtime")
 def test_style_transfer_bytes_and_upload_image():
     # Path to the test image
     image_path = "tests/data/gunbladedraw.png"
@@ -41,6 +44,7 @@ def test_style_transfer_bytes_and_upload_image():
     print(f"Style transfer successful. Image saved at: {response_data['path']}")
 
 
+@pytest.mark.skip(reason="requires heavy model and long runtime")
 def test_style_transfer_bytes_and_upload_image_without_canny():
     # Path to the test image
     image_path = "tests/data/gunbladedraw.png"
diff --git a/tests/test_bucket_api.py b/tests/test_bucket_api.py
deleted file mode 100644
index 44f2dbb..0000000
--- a/tests/test_bucket_api.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from io import BytesIO
-
-from PIL import Image
-
-from stable_diffusion_server.bucket_api import upload_to_bucket, check_if_blob_exists
-
-
-def test_upload_to_bucket():
-    link = upload_to_bucket('test.txt', 'tests/test.txt')
-    assert link == 'https://storage.googleapis.com/static.netwrck.com/static/uploads/test.txt'
-    #  check if file exists
-    assert check_if_blob_exists('test.txt')
-
-
-def test_upload_bytesio_to_bucket():
-    # bytesio = open('backdrops/medi.png', 'rb')
-    pilimage = Image.open('backdrops/medi.png')
-    # bytesio = pilimage.tobytes()
-    bs = BytesIO()
-    pilimage.save(bs, "jpeg")
-    bio = bs.getvalue()
-    link = upload_to_bucket('medi.png', bio, is_bytesio=True)
-    assert link == 'https://storage.googleapis.com/static.netwrck.com/static/uploads/medi.png'
-    #  check if file exists
-    assert check_if_blob_exists('medi.png')
diff --git a/tests/unit/test_bucket_api.py b/tests/unit/test_bucket_api.py
new file mode 100644
index 0000000..dec89f6
--- /dev/null
+++ b/tests/unit/test_bucket_api.py
@@ -0,0 +1,56 @@
+from io import BytesIO
+
+from PIL import Image
+
+import importlib
+import os
+
+import boto3
+from moto import mock_aws
+
+from stable_diffusion_server import bucket_api as bucket_api
+
+
+@mock_aws
+def test_upload_to_bucket():
+    os.environ['STORAGE_PROVIDER'] = 'r2'
+    os.environ['BUCKET_NAME'] = 'test-bucket'
+    os.environ['BUCKET_PATH'] = 'static/uploads'
+    os.environ['R2_ENDPOINT_URL'] = 'https://s3.amazonaws.com'
+
+    import env
+    importlib.reload(env)
+    importlib.reload(bucket_api)
+    bucket_api.init_storage()
+
+    s3 = boto3.client('s3', endpoint_url=os.environ['R2_ENDPOINT_URL'])
+    s3.create_bucket(Bucket='test-bucket')
+
+
+    link = bucket_api.upload_to_bucket('test.txt', 'tests/test.txt')
+    assert link == 'https://test-bucket/static/uploads/test.txt'
+    assert bucket_api.check_if_blob_exists('test.txt')
+
+
+@mock_aws
+def test_upload_bytesio_to_bucket():
+    os.environ['STORAGE_PROVIDER'] = 'r2'
+    os.environ['BUCKET_NAME'] = 'test-bucket'
+    os.environ['BUCKET_PATH'] = 'static/uploads'
+    os.environ['R2_ENDPOINT_URL'] = 'https://s3.amazonaws.com'
+
+    import env
+    importlib.reload(env)
+    importlib.reload(bucket_api)
+    bucket_api.init_storage()
+
+    s3 = boto3.client('s3', endpoint_url=os.environ['R2_ENDPOINT_URL'])
+    s3.create_bucket(Bucket='test-bucket')
+
+    pilimage = Image.open('tests/data/gunbladedraw.png').convert('RGB')
+    bs = BytesIO()
+    pilimage.save(bs, "jpeg")
+    bio = bs.getvalue()
+    link = bucket_api.upload_to_bucket('medi.png', bio, is_bytesio=True)
+    assert link == 'https://test-bucket/static/uploads/medi.png'
+    assert bucket_api.check_if_blob_exists('medi.png')
diff --git a/tests/test_bumpy_detection.py b/tests/unit/test_bumpy_detection.py
similarity index 55%
rename from tests/test_bumpy_detection.py
rename to tests/unit/test_bumpy_detection.py
index 63b95be..3b35fb8 100644
--- a/tests/test_bumpy_detection.py
+++ b/tests/unit/test_bumpy_detection.py
@@ -6,38 +6,37 @@
 from stable_diffusion_server.bumpy_detection import detect_too_bumpy
 
 current_dir = Path(__file__).parent
+data_dir = current_dir.parent / "data"
 
 
 def test_detect_too_bumpy():
     files = [
-        # "data/bug.webp",
-        # "data/bug1.webp",
-        # "data/bug2.webp",
-        "data/bug3.webp",
-        "data/bug4.webp",
+        "bug3.webp",
+        "bug4.webp",
     ]
     for file in files:
-        image = Image.open(current_dir / f'{file}')
+        image = Image.open(data_dir / file)
         is_bumpy = detect_too_bumpy(image)
         assert is_bumpy
 
     image = Image.open(
-        current_dir /
-        "data/Serqet-Selket-goddess-of-protection-Egyptian-Heritage-octane-render-cinematic-color-grading-soft-light-atmospheric-reali.png"
+        data_dir /
+        "Serqet-Selket-goddess-of-protection-Egyptian-Heritage-octane-render-cinematic-color-grading-soft-light-atmospheric-reali.png"
     )
     is_bumpy = detect_too_bumpy(image)
     assert not is_bumpy
 
     # run over every img in outputs dir
-    outputs_dir = (current_dir).parent / "outputs"
-    for file in outputs_dir.iterdir():
-        if file.is_file():
-            image = Image.open(file)
-            is_bumpy = detect_too_bumpy(image)
-            assert not is_bumpy
+    outputs_dir = data_dir.parent / "outputs"
+    if outputs_dir.exists():
+        for file in outputs_dir.iterdir():
+            if file.is_file():
+                image = Image.open(file)
+                is_bumpy = detect_too_bumpy(image)
+                assert not is_bumpy
 
     # run over every dir in tests/data/bugs dir
-    bugs_dir = current_dir / "data/bugs"
+    bugs_dir = data_dir / "bugs"
     logger.info("checking bugs dir")
     for file in bugs_dir.iterdir():
         if file.is_file():
diff --git a/tests/test_image_processing.py b/tests/unit/test_image_processing.py
similarity index 100%
rename from tests/test_image_processing.py
rename to tests/unit/test_image_processing.py