diff --git a/configuration.yaml b/configuration.yaml
index 7da5d8ca..1041b064 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -1,20 +1,23 @@
 ---
 release: queens
 
-tag: 'aug-2017-elections'
+tag: 'oct-2017-elections'
 
 timeframe:
   name: 'Ocata-Pike'
   start: '2016-09-16T23:59'
-  end: '2017-08-03T23:59'
-  email_deadline: '2017-08-05T23:59'
+  end: '2017-08-30T23:59'
+  email_deadline: '2017-10-09T23:59'
 
-tc_seats: 7
+tc_seats: 6
 
 timeline:
-  - name: 'PTL nomination'
-    start: '2017-07-31T23:59'
-    end:   '2017-08-09T23:45'
-  - name: 'PTL elections'
-    start: '2017-08-09T23:59'
-    end:   '2017-08-16T23:45'
+  - name: 'TC nomination'
+    start: '2017-09-29T23:59'
+    end:   '2017-10-08T23:45'
+  - name: 'TC Campaigning'
+    start: '2017-10-09T23:59'
+    end:   '2017-10-12T23:45'
+  - name: 'TC Election'
+    start: '2017-10-12T23:59'
+    end:   '2017-10-18T23:45'
diff --git a/doc/source/index.rst b/doc/source/index.rst
index a765281a..0f3ee8fe 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -11,7 +11,7 @@ See `Election system`_, `PTL details`_ and `TC details`_.
 .. Below is the official list of candidates for the current round.
 
 .. TODO: Change from ptl.rst to tc.rst when TC rounds starts
-.. .. include:: ptl.rst
+.. include:: tc.rst
 
 
 Previous elections
@@ -24,7 +24,8 @@ Election Officials
 ==================
 
 * Kendall Nelson (diablo_rojo), knelson at openstack dot org
-* Emmet Hikory (persia), persia at shipstone dot jp 
+* Emmet Hikory (persia), persia at shipstone dot jp
+* Tony Breeds (tonyb), tony at bakeyournoodle dot com
 
 For any questions, please contact officials by mail or over irc at
 #openstack-dev Freenode channel.