diff --git a/Makefile b/Makefile
index 88dad093..dc42a487 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,20 @@
-
-URL := http://localhost:1313
-OPEN_CMD := $(shell command -v open || command -v xdg-open || echo : 2>/dev/null)
 HUGO_VERSION := 0.89.4/extended
-OUTPUT_DIR:=/
+HOSTNAME := $(shell hostname)
+PORT := 8080
+
+.PHONY: server
+server: hugo
+	./hugo server -w . \
+		--bind 0.0.0.0 --port $(PORT) \
+		-b http://$(HOSTNAME):$(PORT)
 
 hugo:
 	@echo Downloading hugo wrapper
 	@curl -L -o hugo https://github.com/khos2ow/hugo-wrapper/releases/download/v1.6.0/hugow
-	@@chmod +x hugo
+	@chmod +x hugo
 	@./hugo --get-version $(HUGO_VERSION)
 
-server: hugo
-	(sleep 2; $(OPEN_CMD) $(URL)) &
-	./hugo server -w .
-
-static: hugo
-	./hugo -D
-
-
-.DEFAULT_GOAL := static
-
-.PHONY: static server
+.PHONY: clean
+clean:
+	rm -rf .hugo
+	rm -f hugo .hugo_build.lock
diff --git a/README.md b/README.md
index a408d361..cce21d43 100644
--- a/README.md
+++ b/README.md
@@ -23,13 +23,11 @@ cd microshift-documentation
 
 ```bash
 npm install
-# if you do want to download and use hugo-extended in current directory
 make server
-# or if you already have hugo-extended installed in $PATH
-hugo serve
 ```
 
-This will start the local Hugo server on port 1313. Open up your browser to <http://localhost:1313> to view the website. As you make changes to the source files, Hugo updates the website and forces a browser refresh.
+This will start the local Hugo server on port 8080. Open up your browser to <http://localhost:8080> to view the website.
+As you make changes to the source files, Hugo updates the website and forces a browser refresh.
 
 ## Get involved with MicroShift
 
diff --git a/content/en/_index.html b/content/en/_index.html
index 8540ca99..516734b6 100644
--- a/content/en/_index.html
+++ b/content/en/_index.html
@@ -21,12 +21,16 @@
 
 We believe these properties should also make MicroShift a great tool for other use cases such as Kubernetes applications development on resource-constrained systems, scale testing, and provisioning of lightweight Kubernetes control planes.
 
-### continue with:
-<button id="btn-concepts" class="button" onclick="location.href='https:\/\/github.com\/openshift\/microshift\/blob\/main\/docs\/user\/getting_started.md';"
-        aria-label="Getting Started">Getting
-    Started</button> <button id="btn-concepts" class="button" onclick="location.href='https:\/\/github.com\/openshift\/microshift#user-documentation';"
-                             aria-label="Microshift Documentation">Microshift
-    Documentation</button>
+<button id="btn-concepts" class="button"
+        onclick="location.href='https:\/\/github.com\/microshift-io\/microshift';"
+        aria-label="Getting Started">
+    Getting Started
+</button>
+<button id="btn-concepts" class="button"
+        onclick="location.href='https:\/\/github.com\/microshift-io\/microshift\/blob\/main\/README.md';"
+        aria-label="Documentation">
+    Documentation
+</button>
 
 {{% /blocks/feature-noimg %}}
 {{< /blocks/section >}}
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index afce89c1..da4a6090 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -6,10 +6,10 @@
 		<ul class="navbar-nav mt-2 mt-lg-0">
 			{{ $p := . }}
 			<li class="nav-item mr-2 mb-lg-0">
-				<a class="nav-link active" href="https://github.com/openshift/microshift/blob/main/docs/user/getting_started.md" >Getting Started</span></a>
+				<a class="nav-link active" href="https://github.com/microshift-io/microshift" >Getting Started</span></a>
 			</li>
 			<li class="nav-item mr-2 mb-lg-0">
-				<a class="nav-link active" href="https://github.com/openshift/microshift#user-documentation" >User Documentation</span></a>
+				<a class="nav-link active" href="https://github.com/microshift-io/microshift/blob/main/README.md" >Documentation</span></a>
 			</li>
 			{{ if  .Site.Params.versions }}
 			<li class="nav-item dropdown">