diff --git a/.gitignore b/.gitignore
index 39d12a9..812f484 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,3 @@
 
 # AI generated content
 CLAUDE.md
-
-# Content is on separate repository
-content/
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..7ccb492
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,18 @@
+#####################################################################
+#                            Build Stage                            #
+#####################################################################
+FROM hugomods/hugo:exts as builder
+# Base URL
+ARG HUGO_BASEURL=
+ENV HUGO_BASEURL=${HUGO_BASEURL}
+# Build site
+COPY . /src
+# Replace below build command at will.
+RUN hugo
+
+#####################################################################
+#                            Final Stage                            #
+#####################################################################
+FROM hugomods/hugo:nginx
+# Copy the generated files to keep the image as small as possible.
+COPY --from=builder /src/public /site
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..56a853c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+.PHONY: dev build push release
+
+TIMESTAMP := $(shell date +%Y%m%d.%H%M)
+IMAGE := git.coopcloud.tech/wiki-cafe/wiki-cafe-site
+
+# Start development server
+dev:
+	docker run --rm -v $(pwd):/src -p 1313:1313 hugomods/hugo:base-non-root-0.145.0 server -D
+
+build:
+	docker build \
+		-t $(IMAGE):$(TIMESTAMP) \
+		-t $(IMAGE):last \
+		--build-arg HUGO_BASEURL=https://wiki.cafe \
+		.
+
+push:
+	docker push $(IMAGE):$(TIMESTAMP)
+	docker push $(IMAGE):last
+
+release: build push
+	@echo "Release created with timestamp: $(TIMESTAMP)"
+	@echo "Push to Gitea registry: make login tag-registry push-registry"
diff --git a/content/_index.md b/content/_index.md
new file mode 100644
index 0000000..58abeeb
--- /dev/null
+++ b/content/_index.md
@@ -0,0 +1,11 @@
+---
+title: "Wiki Cafe"
+date: 2025-03-14T04:59:59Z
+draft: false
+---
+
+{{< hero >}}
+Wiki Cafe is a [co-op](pages/co-op) \
+that provides [fedwiki hosting](pages/fedwiki_service) \
+and [wiki education](pages/wiki_education) services.
+{{< /hero >}}
diff --git a/content/pages/co-op.md b/content/pages/co-op.md
new file mode 100644
index 0000000..cf88c07
--- /dev/null
+++ b/content/pages/co-op.md
@@ -0,0 +1,8 @@
+---
+title: "Co-op"
+date: 2022-02-14T22:03:26-05:00
+draft: false
+hideMeta: true
+---
+
+Wiki Cafe is a co-operative in its early stages of formation. We value multistakeholder governance and cooperative principles in our goal to enable new ways of sharing and creating.
diff --git a/content/pages/federated_wiki.md b/content/pages/federated_wiki.md
new file mode 100644
index 0000000..5fb5fbe
--- /dev/null
+++ b/content/pages/federated_wiki.md
@@ -0,0 +1,7 @@
+---
+title: 'Federated Wiki'
+date: '2025-03-20T05:19:15Z'
+draft: true
+---
+
+Federated Wiki, or Fedwiki, is a tool for managing knowledge in a collaborative but decentralized way.
diff --git a/content/pages/fedwiki_service.md b/content/pages/fedwiki_service.md
new file mode 100644
index 0000000..40164a9
--- /dev/null
+++ b/content/pages/fedwiki_service.md
@@ -0,0 +1,12 @@
+---
+title: "Fedwiki Service"
+date: 2022-02-14T21:42:36-05:00
+draft: false
+hideMeta: true
+---
+
+Explore new ways of creating and sharing with managed Federated Wiki hosting.
+
+## Access
+
+The Fedwiki Service is currently under development. If you are interested in participating in the development or testing of the Fedwiki service, send an email to mail *at* wiki.cafe.
diff --git a/content/pages/wiki_education.md b/content/pages/wiki_education.md
new file mode 100644
index 0000000..6012a5c
--- /dev/null
+++ b/content/pages/wiki_education.md
@@ -0,0 +1,12 @@
+---
+title: "Wiki Education"
+date: 2022-02-14T22:02:42-05:00
+draft: false
+hideMeta: true
+---
+
+Wiki is not just software, it's a way of thinking about thinking. We hope to share the knowledge of the wiki community through our Wiki Education resources.
+
+## Access
+
+The Wiki Education resources are currently under development. If you are interested in participating in the development of these resources, send an email to mail *at* wiki.cafe.