diff --git a/Dockerfile b/Dockerfile
index 456cd9e62a..d94eb75301 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@
 # TODO:
 #	- delete archives to keep small the container small
 #	- setup caching (for apt, pip, ndk, sdk and p4a recipes downloads)
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 
 # get the latest version from https://developer.android.com/ndk/downloads/index.html
diff --git a/pythonforandroid/recipes/python3crystax/__init__.py b/pythonforandroid/recipes/python3crystax/__init__.py
index 4e96bea57e..96cdf035b4 100644
--- a/pythonforandroid/recipes/python3crystax/__init__.py
+++ b/pythonforandroid/recipes/python3crystax/__init__.py
@@ -12,7 +12,7 @@
 
 
 class Python3Recipe(TargetPythonRecipe):
-    version = '3.5'
+    version = '3.6'
     url = ''
     name = 'python3crystax'