diff --git a/configuration.yaml b/configuration.yaml
index 12d93509..b247468d 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -1,23 +1,20 @@
 ---
-release: pike
+release: queens
 
-tag: 'jan-2017-elections'
+tag: 'july-2017-elections'
 
 timeframe:
-  name: 'Newton-Ocata'
-  start: '2016-04-07T00:00'
-  end: '2017-02-22T23:59'
-  email_deadline: '2017-04-10T23:59'
+  name: 'Ocata-Pike'
+  start: '2016-09-16T23:59'
+  end: '2017-08-03T23:59'
+  email_deadline: '2017-08-05T23:59'
 
 tc_seats: 7
 
 timeline:
-  - name: 'TC nomination'
-    start: '2017-03-30T23:59'
-    end:   '2017-04-09T23:45'
-  - name: 'TC campaigning'
-    start: '2017-04-09T23:59'
-    end:   '2017-04-13T23:45'
-  - name: 'TC elections'
-    start: '2017-04-13T23:59'
-    end:   '2017-04-20T23:45'
+  - 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'
diff --git a/doc/source/index.rst b/doc/source/index.rst
index b51a7bd4..7cd77f78 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -23,9 +23,8 @@ Previous elections
 Election Officials
 ==================
 
-* Tony Breeds (tonyb), tony at bakeyournoodle dot com
-* Tristan Cacqueray (tristanC), tdecacqu at redhat dot com
 * Kendall Nelson (diablo_rojo), knelson at openstack dot org
+* Emmet Hikory (persia), emmet.hikory at codethink dot co dot uk
 
 For any questions, please contact officials by mail or over irc at
 #openstack-dev Freenode channel.