diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f28fa07
--- /dev/null
+++ b/README.md
@@ -0,0 +1,15 @@
+# SoftwareFactory
+
+## Getting started
+
+### Pre
+
+Make sure Podman API socket is running and enabled
+
+´´´bash
+sudo systemctl enable --now podman.socket
+´´´
+
+### Build terraform-podman
+
+podman build -t terraform-podman infrastructure/terraform/
diff --git a/infrastructure/terraform/Dockerfile b/infrastructure/terraform/Dockerfile
deleted file mode 100644
index f6f1460..0000000
--- a/infrastructure/terraform/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-FROM hashicorp/terraform:1.13
\ No newline at end of file
diff --git a/infrastructure/terraform/deploy b/infrastructure/terraform/deploy
deleted file mode 100644
index 0577cb5..0000000
--- a/infrastructure/terraform/deploy
+++ /dev/null
@@ -1,6 +0,0 @@
-podman run --rm -it \
-  -v /run/user/$UID/podman/podman.sock:/var/run/podman/podman.sock \
-  -v $(pwd):/workspace \
-  -w /workspace \
-  -e PODMAN_SOCK=unix:///var/run/podman/podman.sock \
-  terraform-podman plan
diff --git a/terraform-podman/Dockerfile b/terraform-podman/Dockerfile
new file mode 100644
index 0000000..7d90d8f
--- /dev/null
+++ b/terraform-podman/Dockerfile
@@ -0,0 +1 @@
+FROM docker.io/hashicorp/terraform:1.13:1.13
\ No newline at end of file
diff --git a/terraform-podman/deploy b/terraform-podman/deploy
new file mode 100644
index 0000000..8c6c323
--- /dev/null
+++ b/terraform-podman/deploy
@@ -0,0 +1,6 @@
+sudo podman run --rm -it \
+  -v /run/podman/podman.sock:/run/podman/podman.sock \
+  -v $(pwd):/workspace \
+  -w /workspace \
+  -e PODMAN_SOCK=unix:///run/podman/podman.sock \
+  terraform-podman plan
diff --git a/terraform/main.tf b/terraform/main.tf
new file mode 100644
index 0000000..3b26553
--- /dev/null
+++ b/terraform/main.tf
@@ -0,0 +1,16 @@
+terraform {
+  required_providers {
+    podman = {
+      source  = "containers/podman"
+      version = "0.0.1"
+    }
+  }
+}
+
+provider "podman" {
+  uri = "unix:///run/podman/podman.sock"
+}
+
+module "syslog" {
+  source      = "./modules/syslog"
+}
\ No newline at end of file
diff --git a/infrastructure/syslog/deploy b/terraform/modules/syslog/deploy
similarity index 100%
rename from infrastructure/syslog/deploy
rename to terraform/modules/syslog/deploy
diff --git a/infrastructure/syslog/main.tf b/terraform/modules/syslog/main.tf
similarity index 82%
rename from infrastructure/syslog/main.tf
rename to terraform/modules/syslog/main.tf
index 8781c0a..abe33ac 100644
--- a/infrastructure/syslog/main.tf
+++ b/terraform/modules/syslog/main.tf
@@ -1,15 +1,3 @@
-terraform {
-  required_providers {
-    podman = {
-      source = "project0/podman"
-    }
-  }
-}
-
-provider "podman" {
-  uri = "unix:///run/podman/podman.sock"
-}
-
 resource "podman_container" "syslog_ng" {
   name    = "syslog-ng"
   image   = "lscr.io/linuxserver/syslog-ng:latest"