diff --git a/buscribe-api/Dockerfile b/buscribe-api/Dockerfile
index 8762e11..35338b0 100644
--- a/buscribe-api/Dockerfile
+++ b/buscribe-api/Dockerfile
@@ -4,7 +4,7 @@ FROM alpine:3.14
 RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev file make busybox-extras
 
 # Install gevent so that we don't need to re-install it when common changes
-RUN pip install gevent==1.5a2 greenlet==0.4.16
+RUN pip install gevent
 
 # Install common lib first as it changes less
 COPY common /tmp/common
diff --git a/buscribe-api/setup.py b/buscribe-api/setup.py
index 7f57630..06406e4 100644
--- a/buscribe-api/setup.py
+++ b/buscribe-api/setup.py
@@ -7,8 +7,7 @@ setup(
     install_requires = [
         "argh",
         "psycopg2",
-        "gevent==1.5a2",
-        "greenlet==0.4.16",
+        "gevent",
         "psycogreen",
         "wubloader-common",
         "python-dateutil",
diff --git a/common/common/segments.py b/common/common/segments.py
index 7a6e1da..dbc9cfc 100644
--- a/common/common/segments.py
+++ b/common/common/segments.py
@@ -342,7 +342,7 @@ def ffmpeg_cut_stdin(output_file, cut_start, duration, encode_args):
 			# permission to "overwrite" it.
 			'-y',
 		]
-	args = map(str, args)
+	args = list(map(str, args))
 	logging.info("Running full cut with args: {}".format(" ".join(args)))
 	return subprocess.Popen(args, stdin=subprocess.PIPE, stdout=output_file)
 
diff --git a/common/setup.py b/common/setup.py
index 43818fc..ae2a724 100644
--- a/common/setup.py
+++ b/common/setup.py
@@ -5,7 +5,7 @@ setup(
 	version = "0.0.0",
 	packages = find_packages(),
 	install_requires = [
-		"gevent==1.5a2",
+		"gevent",
 		"monotonic",
 		"prometheus-client",
 	],