diff --git a/deployment.lua b/deployment.lua
new file mode 100644
index 0000000..c7330e9
--- /dev/null
+++ b/deployment.lua
@@ -0,0 +1,32 @@
+local app_name = "Express Blog"
+local repo = "ssh://git@git.jasonpoage.vpn:29418/jason/express-blog.git"
+local config_dir = "/srv/jasonpoage.com/env/"
+-- 1. Static Lookups
+local base = "/srv/jasonpoage.com"
+local deployments = base .. "/deployments"
+
+function get_config(env_key)
+	-- Specific folder name for this environment
+	local instance_name = "blog-" .. env_key
+	local deploy_link = deployments .. "/" .. instance_name
+
+	return {
+		deploy_link = deploy_link,
+		config_file = config_dir .. env_key .. ".toml",
+		service_name = "expressjs-blog@" .. env_key .. ".service",
+		-- Tracking which deployments were successful
+		get_release_dir = function(timestamp)
+			return deploy_link .. "-" .. timestamp
+		end,
+		count = (env_key == "release") and 5 or 1,
+	}
+end
+
+return {
+	app_name = app_name,
+	timestamp_format = "%Y%m%d-%H%M%S",
+	repo = repo,
+	base = base,
+	release = get_config("release"),
+	testing = get_config("testing"),
+}
diff --git a/deployment/README b/deployment/README
new file mode 100644
index 0000000..32a7bf0
--- /dev/null
+++ b/deployment/README
@@ -0,0 +1,2 @@
+#Entry point:
+python . --config ../deployment.lua --dry-run --branch refs/heads/dev
diff --git a/deployment/core/task_runner.py b/deployment/core/task_runner.py
index 09a77ce..5ddf4ce 100755
--- a/deployment/core/task_runner.py
+++ b/deployment/core/task_runner.py
@@ -48,7 +48,7 @@
             CheckNix,
             VerifySystemDependencies,
             GetDeploymentConfig,
-            VerifyConfigExists,
+            LoadServerConfig,
             EnsureBuildPaths,
             YarnBuild,
             TestRunner,
diff --git a/deployment/core/tasks.py b/deployment/core/tasks.py
index 2b5c963..ab83a00 100644
--- a/deployment/core/tasks.py
+++ b/deployment/core/tasks.py
@@ -21,38 +21,40 @@
     def _run(self):
         # 1. Load Lua
         lua = LuaRuntime(unpack_returned_tuples=True)
-        with open(self.get_arg("config"), "r") as f:
+        config_path = self.get_arg("config")
+
+        with open(config_path, "r") as f:
             module = lua.execute(f.read())
 
-        # 2. Call the factory
-        target_env = self.get_arg("branch").split("/")[-1]  # e.g., 'main' or 'testing'
-        print(target_env)
+        # 2. Determine environment key from branch
+        # Mapping 'main' to 'release' as per lua schema
+        branch = self.get_arg("branch").split("/")[-1]
+        target_env = "release" if branch == "main" else branch
 
-        # 3. Hydrate self.env
-        config = module.get_config(target_env)
+        if target_env not in module:
+            self.fail(f"Environment '{target_env}' not defined in {config_path}")
 
-        self.env.build_dir = Path(config.paths.build)
-        self.env.release_dir = Path(config.paths.release_dir)
-        self.env.deploy_path = Path(config.paths.deploy_link)
-        self.env.service = config.systemd.service_name
-        self.env.config_file_source = config.paths.config_file
-        self.env.meta = config.meta
+        # 3. Extract environment specific sub-table
+        cfg = module[target_env]
 
-        self.print(f"✅ Context hydrated for {config.meta.app_name}:{target_env}")
+        # 4. Hydrate self.env
+        self.env.lua_cfg = cfg  # Store the lua object for functional calls later
+        self.env.app_name = module.app_name
+        self.env.repo = module.repo
+        self.env.timestamp_format = module.timestamp_format
+
+        self.env.deploy_path = Path(cfg.deploy_link)
+        self.env.service_name = cfg.service_name
+        self.env.config_file_source = Path(cfg.config_file)
+        self.env.retention_count = cfg.count
+        self.env.deploy_branch = branch
+
+        self.print(f"✅ Context hydrated for {self.env.app_name}:{target_env}")
+        # self.env.build_dir = Path(config.paths.build)
         return True
 
 
 class LoadServerConfig(SuiteTask):
-    """Fails the pipeline if the required TOML config is missing from the host"""
-
-    _stage = Stage.BOOTSTRAP
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.name = "Verify the server's toml configuration exists"
-
-
-class VerifyConfigExists(SuiteTask):
     """Verifies TOML existence and hydrates the environment with health check URI components"""
 
     _stage = Stage.BOOTSTRAP
@@ -114,13 +116,23 @@
         self.name = "Running Yarn build process"
 
     def _run(self):
-        build_dir = self.env.build_dir
-        self.sh(
-            f"git clone --branch {self.env.deploy_branch} {self.get_arg('repo')} {build_dir}"
+        # Use a temporary build directory with -BUILDING suffix
+        # This is finalized in AtomicDeploy
+        timestamp = time.strftime(self.env.timestamp_format)
+        self.env.release_dir = Path(self.env.lua_cfg.get_release_dir(timestamp))
+        self.env.build_dir = self.env.release_dir.with_name(
+            self.env.release_dir.name + "-BUILDING"
         )
-        self.sh("git submodule update --init --recursive", cwd=build_dir)
-        self.sh("yarn install", cwd=build_dir)
-        self.sh("yarn combine:css", cwd=build_dir)
+
+        self.print(f"  [BUILD] Target: {self.env.build_dir}")
+
+        self.sh(
+            f"git clone --branch {self.env.deploy_branch} {self.env.repo} {self.env.build_dir}"
+        )
+        self.sh("git submodule update --init --recursive", cwd=self.env.build_dir)
+        self.sh("yarn install", cwd=self.env.build_dir)
+        self.sh("yarn combine:css", cwd=self.env.build_dir)
+        return True
 
 
 class AtomicDeploy(SuiteTask):
@@ -135,11 +147,19 @@
         self.name = "Executing atomic symlink swap"
 
     def _run(self):
-        env = self.env
-        self.sh(f"mkdir -p {env.release_dir}")
-        self.sh(f"rsync -a --delete {env.build_dir}/ {env.release_dir}/")
-        self.sh(f"ln -sfn {env.release_dir} {env.deploy_path}")
-        self.sh(f"sudo systemctl restart {env.service_name}")
+        # 1. Finalize the directory name (remove -BUILDING)
+        self.sh(f"mv {self.env.build_dir} {self.env.release_dir}")
+
+        # 2. Atomic Symlink Swap
+        temp_link = self.env.deploy_path.with_name(self.env.deploy_path.name + "_tmp")
+        self.sh(f"ln -sfn {self.env.release_dir} {temp_link}")
+        self.sh(f"mv -Tf {temp_link} {self.env.deploy_path}")
+
+        # 3. Restart Service
+        self.sh(f"sudo systemctl restart {self.env.service_name}")
+
+        self.print(f"🚀 Deployed to {self.env.deploy_path} -> {self.env.release_dir}")
+        return True
 
 
 class HealthCheck(SuiteTask):
diff --git a/deployment/lib/types.py b/deployment/lib/types.py
index 1fe95b9..ddc4c89 100644
--- a/deployment/lib/types.py
+++ b/deployment/lib/types.py
@@ -1,5 +1,4 @@
 import os
-import time
 from enum import Enum
 from pathlib import Path
 
@@ -22,7 +21,6 @@
     service_name: str
     release_dir: Path
     test_endpoint_uri: str
-    meta: dict = dict()
     pidfile: Path = Path()
 
     def __init__(self, timestamp_format: str | None = None):
@@ -33,12 +31,12 @@
         self.build_dir: Path = Path()
         self.service_name: str = ""
         self.release_dir: Path = Path()
-        self.server_schema: str = "http"
-        self.server_domain: str = "localhost"
+        self.server_schema = "http"
+        self.server_address = "localhost"
+        self.pidfile = Path("/tmp/hexascript_test.pid")
 
         self.root_dir = os.getcwd()
         if timestamp_format is not None:
             self.timestamp_format = timestamp_format
-        self.timestamp = time.strftime(self.timestamp_format)
         self.workspace = Path(os.getenv("WORKSPACE", self.root_dir))
         self.build_dir = self.workspace / "build"