diff --git a/Dockerfile b/Dockerfile
index ec636e30..969e7545 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,9 @@
 FROM debian:stable-slim as builder
 
+  RUN apt-get update && apt-get install -y wget
+  RUN wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1-1ubuntu2.1~18.04.23_amd64.deb
+  RUN dpkg -i libssl1.1_1.1.1-1ubuntu2.1~18.04.23_amd64.deb
+
   RUN apt-get update \
       && apt-get install -y --no-install-recommends \
         bzip2 \
@@ -9,7 +13,6 @@ FROM debian:stable-slim as builder
         gawk \
         git \
         libsqlite3-dev \
-        libssl1.1 \
         libzip-dev \
         make \
         openssl \
diff --git a/src/pgsql/pgsql-ddl.lisp b/src/pgsql/pgsql-ddl.lisp
index 03e8962d..4b91eeee 100644
--- a/src/pgsql/pgsql-ddl.lisp
+++ b/src/pgsql/pgsql-ddl.lisp
@@ -198,7 +198,7 @@
         ;; LOCK on the table before we have the index done already
         (or (index-sql index)
             (format stream
-                    "CREATE UNIQUE INDEX ~a ON ~a (~{~a~^, ~})~@[ WHERE ~a~];"
+                    "CREATE UNIQUE INDEX \"~a\" ON ~a (~{~a~^, ~})~@[ WHERE ~a~];"
                     index-name
                     (format-table-name table)
                     (index-columns index)
@@ -224,7 +224,7 @@
            (multiple-value-bind (access-method expression)
                (index-access-method index)
             (format stream
-                    "CREATE~:[~; UNIQUE~] INDEX ~a ON ~a ~@[USING ~a~](~{~a~^, ~})~@[ WHERE ~a~];"
+                    "CREATE~:[~; UNIQUE~] INDEX \"~a\" ON ~a ~@[USING ~a~](~{~a~^, ~})~@[ WHERE ~a~];"
                     (index-unique index)
                     index-name
                     (format-table-name table)