diff --git a/config/sql/channel_videos.sql b/config/sql/channel_videos.sql
index 98567780..279fad29 100644
--- a/config/sql/channel_videos.sql
+++ b/config/sql/channel_videos.sql
@@ -31,6 +31,6 @@ CREATE INDEX channel_videos_published_idx
 
 CREATE INDEX channel_videos_ucid_idx
   ON public.channel_videos
-  USING hash
+  USING btree
   (ucid COLLATE pg_catalog."default");
 
diff --git a/config/sql/nonces.sql b/config/sql/nonces.sql
index d2ec5be6..7b8ce9f2 100644
--- a/config/sql/nonces.sql
+++ b/config/sql/nonces.sql
@@ -5,10 +5,18 @@
 CREATE TABLE public.nonces
 (
   nonce text,
-  expire timestamp with time zone
-)
-WITH (
-  OIDS=FALSE
+  expire timestamp with time zone,
+  CONSTRAINT nonces_id_key UNIQUE (nonce)
 );
 
-GRANT ALL ON TABLE public.nonces TO kemal;
\ No newline at end of file
+GRANT ALL ON TABLE public.nonces TO kemal;
+
+-- Index: public.nonces_nonce_idx
+
+-- DROP INDEX public.nonces_nonce_idx;
+
+CREATE INDEX nonces_nonce_idx
+  ON public.nonces
+  USING btree
+  (nonce COLLATE pg_catalog."default");
+