diff --git a/.travis.yml b/.travis.yml
index ded932948..24b2e11b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,9 @@ language: bash
 services: docker
 
 env:
-  - VERSION=3.6-rc VARIANT=
-  - VERSION=3.6-rc VARIANT=slim
-  - VERSION=3.6-rc VARIANT=alpine
+  - VERSION=3.6 VARIANT=
+  - VERSION=3.6 VARIANT=slim
+  - VERSION=3.6 VARIANT=alpine
   - VERSION=3.5 VARIANT=
   - VERSION=3.5 VARIANT=slim
   - VERSION=3.5 VARIANT=alpine
diff --git a/3.6-rc/Dockerfile b/3.6/Dockerfile
similarity index 99%
rename from 3.6-rc/Dockerfile
rename to 3.6/Dockerfile
index c7361118f..0f65d6039 100644
--- a/3.6-rc/Dockerfile
+++ b/3.6/Dockerfile
@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
 ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
-ENV PYTHON_VERSION 3.6.0rc2
+ENV PYTHON_VERSION 3.6.0
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
 ENV PYTHON_PIP_VERSION 9.0.1
diff --git a/3.6-rc/alpine/Dockerfile b/3.6/alpine/Dockerfile
similarity index 99%
rename from 3.6-rc/alpine/Dockerfile
rename to 3.6/alpine/Dockerfile
index 1f623374c..5e56c2ba8 100644
--- a/3.6-rc/alpine/Dockerfile
+++ b/3.6/alpine/Dockerfile
@@ -18,7 +18,7 @@ ENV LANG C.UTF-8
 RUN apk add --no-cache ca-certificates
 
 ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
-ENV PYTHON_VERSION 3.6.0rc2
+ENV PYTHON_VERSION 3.6.0
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
 ENV PYTHON_PIP_VERSION 9.0.1
diff --git a/3.6-rc/onbuild/Dockerfile b/3.6/onbuild/Dockerfile
similarity index 93%
rename from 3.6-rc/onbuild/Dockerfile
rename to 3.6/onbuild/Dockerfile
index 0cf02adb3..ec9f39f4d 100644
--- a/3.6-rc/onbuild/Dockerfile
+++ b/3.6/onbuild/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM python:3.6-rc
+FROM python:3.6
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/3.6-rc/slim/Dockerfile b/3.6/slim/Dockerfile
similarity index 99%
rename from 3.6-rc/slim/Dockerfile
rename to 3.6/slim/Dockerfile
index 1ed4c46c5..e0c9be023 100644
--- a/3.6-rc/slim/Dockerfile
+++ b/3.6/slim/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
 ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
-ENV PYTHON_VERSION 3.6.0rc2
+ENV PYTHON_VERSION 3.6.0
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
 ENV PYTHON_PIP_VERSION 9.0.1
diff --git a/3.6-rc/windows/windowsservercore/Dockerfile b/3.6/windows/windowsservercore/Dockerfile
similarity index 98%
rename from 3.6-rc/windows/windowsservercore/Dockerfile
rename to 3.6/windows/windowsservercore/Dockerfile
index 29e4cad67..27ff1e198 100644
--- a/3.6-rc/windows/windowsservercore/Dockerfile
+++ b/3.6/windows/windowsservercore/Dockerfile
@@ -8,7 +8,7 @@ FROM microsoft/windowsservercore
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
-ENV PYTHON_VERSION 3.6.0rc2
+ENV PYTHON_VERSION 3.6.0
 ENV PYTHON_RELEASE 3.6.0
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 43bf4a539..66eb4fb82 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -2,8 +2,8 @@
 set -eu
 
 declare -A aliases=(
-	[3.6-rc]='rc'
-	[3.5]='3 latest'
+	[3-7-rc]='rc'
+	[3.6]='3 latest'
 	[2.7]='2'
 )