diff --git a/.readthedocs.yml b/.readthedocs.yml
index 32113fed..464c7826 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -3,8 +3,12 @@ version: 2
 sphinx:
   configuration: docs/conf.py
 
+build:
+    os: ubuntu-20.04
+    tools:
+        python: '3.10'
+
 python:
-  version: 3.6
   install:
     - requirements: docs-requirements.txt
     - requirements: requirements.txt
diff --git a/Dockerfile b/Dockerfile
index 22732dec..8a0d32e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.7
+ARG PYTHON_VERSION=3.10
 
 FROM python:${PYTHON_VERSION}
 
diff --git a/Dockerfile-docs b/Dockerfile-docs
index 9d11312f..98901dfe 100644
--- a/Dockerfile-docs
+++ b/Dockerfile-docs
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.7
+ARG PYTHON_VERSION=3.10
 
 FROM python:${PYTHON_VERSION}
 
diff --git a/Jenkinsfile b/Jenkinsfile
index f524ae7a..f9431eac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,7 +25,7 @@ def buildImages = { ->
       imageDindSSH = "${imageNameBase}:sshdind-${gitCommit()}"
       withDockerRegistry(credentialsId:'dockerbuildbot-index.docker.io') {
         buildImage(imageDindSSH, "-f tests/Dockerfile-ssh-dind .", "")
-        buildImage(imageNamePy3, "-f tests/Dockerfile --build-arg PYTHON_VERSION=3.7 .", "py3.7")
+        buildImage(imageNamePy3, "-f tests/Dockerfile --build-arg PYTHON_VERSION=3.10 .", "py3.10")
       }
     }
   }
@@ -70,7 +70,7 @@ def runTests = { Map settings ->
     throw new Exception("Need Docker version to test, e.g.: `runTests(dockerVersion: '19.03.12')`")
   }
   if (!pythonVersion) {
-    throw new Exception("Need Python version being tested, e.g.: `runTests(pythonVersion: 'py3.7')`")
+    throw new Exception("Need Python version being tested, e.g.: `runTests(pythonVersion: 'py3.x')`")
   }
 
   { ->
diff --git a/Makefile b/Makefile
index b71479ee..27144d4d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,16 @@
 TEST_API_VERSION ?= 1.41
 TEST_ENGINE_VERSION ?= 20.10
 
+ifeq ($(OS),Windows_NT)
+    PLATFORM := Windows
+else
+    PLATFORM := $(shell sh -c 'uname -s 2>/dev/null || echo Unknown')
+endif
+
+ifeq ($(PLATFORM),Linux)
+	uid_args := "--build-arg uid=$(shell id -u) --build-arg gid=$(shell id -g)"
+endif
+
 .PHONY: all
 all: test
 
@@ -19,7 +29,7 @@ build-py3:
 
 .PHONY: build-docs
 build-docs:
-	docker build -t docker-sdk-python-docs -f Dockerfile-docs --build-arg uid=$(shell id -u) --build-arg gid=$(shell id -g) .
+	docker build -t docker-sdk-python-docs -f Dockerfile-docs $(uid_args) .
 
 .PHONY: build-dind-certs
 build-dind-certs:
diff --git a/docs-requirements.txt b/docs-requirements.txt
index d69373d7..1f342fa2 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,2 +1,2 @@
-recommonmark==0.4.0
-Sphinx==1.4.6
+recommonmark==0.7.1
+Sphinx==5.1.1
diff --git a/docs/_static/custom.css b/docs/_static/custom.css
index 5d711eef..b0b2e5d0 100644
--- a/docs/_static/custom.css
+++ b/docs/_static/custom.css
@@ -1,3 +1,8 @@
 dl.hide-signature > dt {
   display: none;
 }
+
+dl.field-list > dt {
+    /* prevent code blocks from forcing wrapping on the "Parameters" header */
+    word-break: initial;
+}
diff --git a/setup.py b/setup.py
index 833de3aa..0b113688 100644
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,7 @@ setup(
     install_requires=requirements,
     tests_require=test_requirements,
     extras_require=extras_require,
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     zip_safe=False,
     test_suite='tests',
     classifiers=[
@@ -72,7 +72,6 @@ setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
diff --git a/tests/Dockerfile b/tests/Dockerfile
index 3236f387..1d60cfe4 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.7
+ARG PYTHON_VERSION=3.10
 
 FROM python:${PYTHON_VERSION}
 
diff --git a/tests/Dockerfile-dind-certs b/tests/Dockerfile-dind-certs
index 8829ff79..6e711892 100644
--- a/tests/Dockerfile-dind-certs
+++ b/tests/Dockerfile-dind-certs
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.6
+ARG PYTHON_VERSION=3.10
 
 FROM python:${PYTHON_VERSION}
 RUN mkdir /tmp/certs
diff --git a/tests/Dockerfile-ssh-dind b/tests/Dockerfile-ssh-dind
index aba9bb34..6f080182 100644
--- a/tests/Dockerfile-ssh-dind
+++ b/tests/Dockerfile-ssh-dind
@@ -1,5 +1,5 @@
-ARG API_VERSION=1.39
-ARG ENGINE_VERSION=19.03.12
+ARG API_VERSION=1.41
+ARG ENGINE_VERSION=20.10.17
 
 FROM docker:${ENGINE_VERSION}-dind