diff --git a/.travis.yml b/.travis.yml
index eae8d46f9..6fe164d6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -107,6 +107,18 @@ jobs:
       <<: *DEFAULTS_JS
       script: make lint-docs
 
+    - stage: Lint
+      name: Verify OpenAPI client code
+      if: (repo = prymitive/karma AND type != pull_request) OR (repo != prymitive/karma AND type = pull_request)
+      language: generic
+      addons:
+        apt:
+          packages:
+            - docker-ce
+      script:
+        - travis_retry make openapi-client
+        - git diff --exit-code
+
     - stage: Snapshots
       name: Percy UI snapshots
       if: (repo = prymitive/karma AND type != pull_request) OR (repo != prymitive/karma AND type = pull_request)
diff --git a/Dockerfile b/Dockerfile
index da73af3c1..d5c6d9371 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
 FROM node:10.16.3-alpine as nodejs-builder
-RUN apk add --update make git
+RUN apk update && apk upgrade && apk add --update make git
 COPY Makefile /src/Makefile
 COPY ui /src/ui
 RUN make -C /src ui
 
 FROM golang:1.13.3-alpine as go-builder
-RUN apk add --update make git
+RUN apk update && apk upgrade && apk add --update make git
 COPY Makefile /src/Makefile
 COPY go.mod /src/go.mod
 COPY go.sum /src/go.sum
diff --git a/Makefile b/Makefile
index e3dab2ad5..03dde31a8 100644
--- a/Makefile
+++ b/Makefile
@@ -167,6 +167,10 @@ format-go: .build/deps-build-go.ok
 format-js: .build/deps-build-node.ok
 	cd ui && ./node_modules/.bin/prettier --write 'src/**/*.js'
 
+.PHONY: openapi-client
+openapi-client:
+	for f in $(wildcard internal/mapper/*/Dockerfile) ; do $(MAKE) -C `dirname "$$f"` ; done
+
 .PHONY: show-version
 show-version:
 	@echo $(VERSION)
diff --git a/demo/Dockerfile b/demo/Dockerfile
index eb0c88609..64ce4bc8c 100644
--- a/demo/Dockerfile
+++ b/demo/Dockerfile
@@ -1,11 +1,11 @@
 FROM node:10.16.3-alpine as nodejs-builder
-RUN apk add --update make git
+RUN apk update && apk upgrade && apk add --update make git
 COPY Makefile /src/Makefile
 COPY ui /src/ui
 RUN make -C /src ui
 
 FROM golang:1.13.3-alpine as go-builder
-RUN apk add --update make git
+RUN apk update && apk upgrade && apk add --update make git
 COPY Makefile /src/Makefile
 COPY go.mod /src/go.mod
 COPY go.sum /src/go.sum
@@ -18,7 +18,7 @@ ARG VERSION
 RUN CGO_ENABLED=0 make -C /src VERSION="${VERSION:-dev}" karma
 
 FROM alpine:3.10
-RUN apk add --update supervisor python && rm  -rf /tmp/* /var/cache/apk/*
+RUN apk update && apk upgrade && apk add --update supervisor python && rm  -rf /tmp/* /var/cache/apk/*
 COPY demo/supervisord.conf /etc/supervisord.conf
 COPY --from=prom/alertmanager:v0.19.0 /bin/alertmanager /alertmanager
 COPY demo/alertmanager.yaml /etc/alertmanager.yaml
diff --git a/internal/mapper/v017/Dockerfile b/internal/mapper/v017/Dockerfile
index ab35e2daf..62861d144 100644
--- a/internal/mapper/v017/Dockerfile
+++ b/internal/mapper/v017/Dockerfile
@@ -1,6 +1,6 @@
 FROM quay.io/goswagger/swagger:v0.20.1
 
-RUN apk add --update curl
+RUN apk update && apk upgrade && apk add --update curl
 
 COPY run.sh /run.sh