diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12f8ed9..0abfdc1 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -238,9 +238,9 @@ IF (NOT Boost_FOUND)
     MESSAGE (SEND_ERROR "[Boost] not found.")
 ENDIF ()
 
-### Open Space Toolkit ▸ Core [2.2.x]
+### Open Space Toolkit ▸ Core [3.0.x]
 
-FIND_PACKAGE ("OpenSpaceToolkitCore" "2.2" REQUIRED)
+FIND_PACKAGE ("OpenSpaceToolkitCore" "3.0" REQUIRED)
 
 IF (NOT OpenSpaceToolkitCore_FOUND)
 
diff --git a/Makefile b/Makefile
index 858a4df..ea090ec 100644
--- a/Makefile
+++ b/Makefile
@@ -23,10 +23,8 @@ dev_username := developer
 
 
 # Handle multi-platform builds locally (CI sets these env vars, but need defaults here)
-TARGETPLATFORM ?= linux/amd64
+TARGETPLATFORM ?= linux/arm64
 $(info Target platform is $(TARGETPLATFORM))
-PLATFORM_SPECIFIC_PACKAGE_NAME ?= x86_64
-$(info Platform specific package name is $(PLATFORM_SPECIFIC_PACKAGE_NAME))
 
 
 pull: ## Pull all images
@@ -221,7 +219,7 @@ build-packages-cpp-standalone: ## Build C++ packages (standalone)
 	@ echo "Building C++ packages..."
 
 	docker run \
-		--platform $(PLATFORM_SPECIFIC_PACKAGE_NAME) \
+		--platform $(TARGETPLATFORM) \
 		--rm \
 		--volume="$(CURDIR):/app:delegated" \
 		--volume="/app/build" \
@@ -245,7 +243,7 @@ build-packages-python-standalone: ## Build Python packages (standalone)
 	@ echo "Building Python packages..."
 
 	docker run \
-		--platform $(PLATFORM_SPECIFIC_PACKAGE_NAME) \
+		--platform $(TARGETPLATFORM) \
 		--rm \
 		--volume="$(CURDIR):/app:delegated" \
 		--volume="/app/build" \
diff --git a/bindings/python/requirements.txt b/bindings/python/requirements.txt
index 085df9b..8c8f3da 100644
--- a/bindings/python/requirements.txt
+++ b/bindings/python/requirements.txt
@@ -1,3 +1,3 @@
 # Apache License 2.0
 
-open-space-toolkit-core~=2.2.0
+open-space-toolkit-core~=3.0.0
diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
index 5d94576..1ce2b06 100644
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@ -39,8 +39,8 @@ RUN apt-get update -y \
 ## Open Space Toolkit ▸ Core
 
 ARG TARGETPLATFORM
-ARG OSTK_CORE_MAJOR="2"
-ARG OSTK_CORE_MINOR="2"
+ARG OSTK_CORE_MAJOR="3"
+ARG OSTK_CORE_MINOR="0"
 
 ## Force an image rebuild when new Core patch versions are detected
 ADD https://api.github.com/repos/open-space-collective/open-space-toolkit-core/git/matching-refs/tags/${OSTK_CORE_MAJOR}.${OSTK_CORE_MINOR} /tmp/open-space-toolkit-core/versions.json