diff --git a/Containerfile b/Containerfile
index 21e953f..1e2873c 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,5 +1,5 @@
 # Build environment for bink CLI with all C dependencies
-ARG FEDORA_VERSION=43
+ARG FEDORA_VERSION=44
 FROM quay.io/fedora/fedora:${FEDORA_VERSION} AS builder
 
 # Install Go and required C libraries for Podman bindings
diff --git a/Makefile b/Makefile
index 5610851..19b5638 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ extract = $(shell grep '$(1)' $(DEFAULTS_GO) | head -1 | sed 's/.*"\(.*\)"/\1/')
 BINK_IMAGE := $(call extract,binkImageBase ):latest
 CLUSTER_IMAGE := $(call extract,clusterImageBase ):latest
 DNS_IMAGE := $(call extract,dnsImageBase ):latest
-FEDORA_VERSION := $(call extract,FedoraVersion )
 
 # Binary
 BINK_BINARY := bink
@@ -40,14 +39,13 @@ build-bink:
 # Build the bink CLI container image
 build-bink-image:
 	@echo "=== Building bink CLI container image ==="
-	podman build --build-arg FEDORA_VERSION=$(FEDORA_VERSION) --build-arg VERSION=$(VERSION) --target builder -t localhost/bink-builder:latest -f Containerfile .
-	podman build --build-arg FEDORA_VERSION=$(FEDORA_VERSION) --build-arg VERSION=$(VERSION) -t $(BINK_IMAGE) -f Containerfile .
+	podman build --build-arg VERSION=$(VERSION) -t $(BINK_IMAGE) -f Containerfile .
 	@echo "✅ Bink CLI image built: $(BINK_IMAGE)"
 
 # Build the cluster container image
 build-cluster-image:
 	@echo "=== Building cluster container image ==="
-	podman build --build-arg FEDORA_VERSION=$(FEDORA_VERSION) -t $(CLUSTER_IMAGE) -f $(VM_DIR)/Containerfile $(VM_DIR)
+	podman build -t $(CLUSTER_IMAGE) -f $(VM_DIR)/Containerfile $(VM_DIR)
 	@echo "✅ Cluster image built: $(CLUSTER_IMAGE)"
 
 # Build the DNS container image
diff --git a/containerfiles/cluster-image/Containerfile b/containerfiles/cluster-image/Containerfile
index 83af529..8ef078b 100644
--- a/containerfiles/cluster-image/Containerfile
+++ b/containerfiles/cluster-image/Containerfile
@@ -1,4 +1,4 @@
-ARG FEDORA_VERSION=43
+ARG FEDORA_VERSION=44
 FROM quay.io/fedora/fedora:${FEDORA_VERSION}
 
 RUN dnf install -y --setopt=install_weak_deps=0 \
diff --git a/containerfiles/dns/Containerfile b/containerfiles/dns/Containerfile
index abc8b8f..b5761e0 100644
--- a/containerfiles/dns/Containerfile
+++ b/containerfiles/dns/Containerfile
@@ -1,4 +1,5 @@
-FROM registry.fedoraproject.org/fedora-minimal
+ARG FEDORA_VERSION=44
+FROM registry.fedoraproject.org/fedora-minimal:${FEDORA_VERSION}
 
 RUN microdnf install -y dnsmasq && microdnf clean all
 
diff --git a/internal/config/defaults.go b/internal/config/defaults.go
index 0d2e15f..829e504 100644
--- a/internal/config/defaults.go
+++ b/internal/config/defaults.go
@@ -13,21 +13,19 @@ const (
 	DefaultNetworkName = "podman"
 	DefaultSubnet      = "10.88.0.0/16"
 
-	FedoraVersion = "43"
-
 	binkImageBase    = "ghcr.io/bootc-dev/bink/bink"
 	clusterImageBase = "ghcr.io/bootc-dev/bink/cluster"
 	dnsImageBase     = "ghcr.io/bootc-dev/bink/dns"
 
 	DefaultNodeImage = "ghcr.io/bootc-dev/bink/node:v1.35-fedora-44-disk"
 
-	DefaultBaseDisk = "/images/disk.qcow2"
+	DefaultBaseDisk              = "/images/disk.qcow2"
 	DefaultControlPlaneMemory    = 1900
 	DefaultControlPlaneMaxMemory = 4096
 	DefaultWorkerMemory          = 768
 	DefaultWorkerMaxMemory       = 2048
 	DefaultVCPUs                 = 2
-	DefaultDiskSize = "10G"
+	DefaultDiskSize              = "10G"
 
 	DefaultSSHPort      = 2222
 	DefaultSSHUser      = "core"