diff --git a/poetry.lock b/poetry.lock
index 37d4e9f5..8d8257c2 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -389,20 +389,19 @@ six = "*"
 category = "main"
 description = "A pure Python interface for the Raspberry Pi camera module."
 name = "picamera"
-optional = true
+optional = false
 python-versions = "*"
 version = "1.13.2b0"
 
 [package.extras]
 array = ["numpy"]
 doc = ["sphinx"]
-test = ["pillow", "coverage", "mock", "numpy", "pytest"]
+test = ["coverage", "pytest", "mock", "pillow", "numpy"]
 
 [package.source]
-reference = "e50a34826fc8691e9f8554c529a1700662724ade"
-type = "git"
-url = "https://github.com/rwb27/picamera.git"
-
+reference = ""
+type = "url"
+url = "https://github.com/rwb27/picamera/releases/download/v1.13.2b0/picamera-1.13.2b0-py3-none-any.whl"
 [[package]]
 category = "main"
 description = "Python Imaging Library (Fork)"
@@ -532,7 +531,7 @@ version = "0.14.0"
 category = "main"
 description = "A module to control Raspberry Pi GPIO channels"
 name = "rpi.gpio"
-optional = true
+optional = false
 python-versions = "*"
 version = "0.6.5"
 
@@ -757,11 +756,8 @@ version = "0.26.1"
 [package.dependencies]
 ifaddr = "*"
 
-[extras]
-rpi = ["picamera", "RPi.GPIO"]
-
 [metadata]
-content-hash = "ce051db85e0994205dbe3606291d049e975939481a85c13ec9d9ce8dc0e693e0"
+content-hash = "2d2cb1c884a9f873a5b7d2f617a54ddcbba60e42b6131a373b906849ff165d96"
 python-versions = "^3.6"
 
 [metadata.files]
diff --git a/pyproject.toml b/pyproject.toml
index 7334c251..ad758be3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -31,8 +31,7 @@ numpy = "1.18.2"
 Pillow = "^5.4"
 scipy = "1.4.1" # Exact version so we can guarantee a wheel
 
-picamera = { git = "https://github.com/rwb27/picamera.git", branch = "master", optional = true }  # Lens shading requires >1.14 or RWB fork, lens-shading branch.
-"RPi.GPIO" = { version = "^0.6.5", optional = true }
+"RPi.GPIO" = { version = "^0.6.5" }
 pyserial = "^3.4" # Used for sangaboard (basic_serial_instrument) until we move to sangaboard pip library
 
 python-dateutil = "^2.8"
@@ -43,12 +42,10 @@ opencv-python-headless = [
 ]
 labthings = "0.6.1"
 pynpm = "^0.1.2"
+picamera = {url = "https://github.com/rwb27/picamera/releases/download/v1.13.2b0/picamera-1.13.2b0-py3-none-any.whl" }
 
 [tool.poetry.scripts]
-build = 'openflexure_microscope.install:build'
-
-[tool.poetry.extras]
-rpi = ["picamera", "RPi.GPIO"]
+build_static = 'openflexure_microscope.install:build'
 
 [tool.poetry.dev-dependencies]
 sphinxcontrib-httpdomain = "^1.7"