diff --git a/.gitignore b/.gitignore
index ad55c0f..036b47c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,5 @@
 /ignition-dracut-7ff38d9.tar.gz
 /ignition-dracut-8f5d1ec.tar.gz
 /ignition-dracut-bdf0a65.tar.gz
+/ignition-d18bf90.tar.gz
+/ignition-dracut-e75fef0.tar.gz
diff --git a/ignition.spec b/ignition.spec
index 998d915..214a208 100644
--- a/ignition.spec
+++ b/ignition.spec
@@ -49,7 +49,7 @@
 # https://github.com/coreos/ignition
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}/v2
-%global commit          ee616d5fb3d21babe288877e842ea137f3e68d0d
+%global commit          d18bf905455ba53c4363d2adbfb1d6777a1be315
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 # define ldflags, buildflags, testflags here. The ldflags were
 # taken from ./build. We will need to periodically check these
@@ -67,13 +67,13 @@
 # https://github.com/coreos/ignition-dracut spec2x branch
 %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo}
 %global dracutimport_path     %{dracutprovider_prefix}
-%global dracutcommit          bdf0a653584eb07b3ea87078ff427473821bdc2c
+%global dracutcommit          e75fef0aad283f052d0344884cbaa08025aca5e0
 %global dracutshortcommit     %(c=%{dracutcommit}; echo ${c:0:7})
 
 
 Name:           ignition
-Version:        2.3.0
-Release:        3.git%{shortcommit}%{?dist}
+Version:        2.4.0
+Release:        1.git%{shortcommit}%{?dist}
 Summary:        First boot installer and configuration tool
 License:        ASL 2.0 and BSD
 URL:            https://%{provider_prefix}
@@ -127,42 +127,58 @@ BuildRequires: golang(golang.org/x/net/http/httpproxy)
 
 # Main package Provides (generated with go-mods-to-bundled-provides.py | sort)
 %if 0%{?with_bundled}
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3err)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.19.11
-Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.19.11
+Provides: bundled(golang(cloud.google.com/go)) = 0.58.0
+Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.58.0
+Provides: bundled(golang(cloud.google.com/go/iam)) = 0.58.0
+Provides: bundled(golang(cloud.google.com/go/internal)) = 0.58.0
+Provides: bundled(golang(cloud.google.com/go/internal/optional)) = 0.58.0
+Provides: bundled(golang(cloud.google.com/go/internal/trace)) = 0.58.0
+Provides: bundled(golang(cloud.google.com/go/internal/version)) = 0.58.0
+Provides: bundled(golang(cloud.google.com/go/storage)) = 0.58.0
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3err)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/internal/arn)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.30.28
+Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.30.28
 Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.0
 Provides: bundled(golang(github.com/coreos/go-systemd/v22/dbus)) = 22.0.0
 Provides: bundled(golang(github.com/coreos/go-systemd/v22/journal)) = 22.0.0
@@ -176,7 +192,7 @@ Provides: bundled(golang(github.com/google/renameio)) = 0.1.0
 Provides: bundled(golang(github.com/google/uuid)) = 1.1.1
 Provides: bundled(golang(github.com/pin/tftp)) = 2.1.0
 Provides: bundled(golang(github.com/pin/tftp/netascii)) = 2.1.0
-Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.3.0
+Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.5.1
 Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 0.0.0-20160330182126.git9a301d65acbb
 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/bdoor)) = 0.0.0-20170707015358.git25eff159a728
 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20170707015358.git25eff159a728
@@ -184,13 +200,63 @@ Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = 0.0.0-201707
 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcvmx)) = 0.0.0-20170707015358.git25eff159a728
 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/vmcheck)) = 0.0.0-20170707015358.git25eff159a728
 Provides: bundled(golang(github.com/vmware/vmw-ovflib)) = 0.0.0-20170608004843.git1f217b9dc714
-Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.0.0-20190228165749.git92fc7df08ae7
-Provides: bundled(golang(golang.org/x/net/idna)) = 0.0.0-20190228165749.git92fc7df08ae7
-Provides: bundled(golang(golang.org/x/sys/unix)) = 0.0.0-20191110163157.gitd32e6e3b99c4
-Provides: bundled(golang(golang.org/x/text/secure/bidirule)) = 0.3.0
-Provides: bundled(golang(golang.org/x/text/transform)) = 0.3.0
-Provides: bundled(golang(golang.org/x/text/unicode/bidi)) = 0.3.0
-Provides: bundled(golang(golang.org/x/text/unicode/norm)) = 0.3.0
+Provides: bundled(golang(golang.org/x/net/context)) = 0.0.0-20200602114024.git627f9648deb9
+Provides: bundled(golang(golang.org/x/net/context/ctxhttp)) = 0.0.0-20200602114024.git627f9648deb9
+Provides: bundled(golang(golang.org/x/net/http2)) = 0.0.0-20200602114024.git627f9648deb9
+Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.0.0-20200602114024.git627f9648deb9
+Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.0.0-20200602114024.git627f9648deb9
+Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.0.0-20200602114024.git627f9648deb9
+Provides: bundled(golang(golang.org/x/net/idna)) = 0.0.0-20200602114024.git627f9648deb9
+Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.0.0-20200602114024.git627f9648deb9
+Provides: bundled(golang(golang.org/x/net/trace)) = 0.0.0-20200602114024.git627f9648deb9
+Provides: bundled(golang(golang.org/x/oauth2)) = 0.0.0-20200107190931.gitbf48bf16ab8d
+Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.0.0-20200107190931.gitbf48bf16ab8d
+Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.0.0-20200107190931.gitbf48bf16ab8d
+Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.0.0-20200107190931.gitbf48bf16ab8d
+Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.0.0-20200107190931.gitbf48bf16ab8d
+Provides: bundled(golang(golang.org/x/sys/internal/unsafeheader)) = 0.0.0-20200610111108.git226ff32320da
+Provides: bundled(golang(golang.org/x/sys/unix)) = 0.0.0-20200610111108.git226ff32320da
+Provides: bundled(golang(golang.org/x/tools/cmd/goimports)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/go/analysis)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/inspect)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/go/ast/astutil)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/go/ast/inspector)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/go/buildutil)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/go/gcexportdata)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/go/internal/cgo)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/go/internal/gcimporter)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/go/internal/packagesdriver)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/go/loader)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/go/packages)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/go/types/objectpath)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/go/types/typeutil)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/internal/analysisinternal)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/internal/event)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/internal/event/core)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/internal/event/keys)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/internal/event/label)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/internal/fastwalk)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/internal/gocommand)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/internal/gopathwalk)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/internal/imports)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(golang.org/x/tools/internal/packagesinternal)) = 0.0.0-20200610160956.git3e83d1e96d0e
+Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.26.0
+Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.26.0
+Provides: bundled(golang(google.golang.org/api/internal)) = 0.26.0
+Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.26.0
+Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.26.0
+Provides: bundled(golang(google.golang.org/api/iterator)) = 0.26.0
+Provides: bundled(golang(google.golang.org/api/option)) = 0.26.0
+Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.26.0
+Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.26.0
+Provides: bundled(golang(google.golang.org/api/transport/cert)) = 0.26.0
+Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.26.0
+Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.26.0
+Provides: bundled(golang(google.golang.org/genproto/googleapis/api/annotations)) = 0.0.0-20200610104632.gita5b850bcf112
+Provides: bundled(golang(google.golang.org/genproto/googleapis/iam/v1)) = 0.0.0-20200610104632.gita5b850bcf112
+Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc/code)) = 0.0.0-20200610104632.gita5b850bcf112
+Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc/status)) = 0.0.0-20200610104632.gita5b850bcf112
+Provides: bundled(golang(google.golang.org/genproto/googleapis/type/expr)) = 0.0.0-20200610104632.gita5b850bcf112
 %endif
 
 
@@ -540,6 +606,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %endif
 
 %changelog
+* Mon Jul 13 2020 Benjamin Gilbert <bgilbert@redhat.com> - 2.4.0-1.gitd18bf90
+- New release
+- Bump ignition-dracut
+
 * Mon Jun 15 2020 Timothée Ravier <travier@redhat.com> - 2.3.0-3.gitee616d5
 - Update to latest ignition-dracut to fix coreos-gpt-setup unit
   https://github.com/coreos/ignition-dracut/pull/191
diff --git a/sources b/sources
index 8230405..7762359 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ignition-ee616d5.tar.gz) = 179e916ff97b3a6cd98c49cde7f2fbb213afbca29c33a3e58d2ca9c52dd6f51129bb47c72aec82911f251d6c3e43867109dcf6f4b97429b8383f5fc81be04e3f
-SHA512 (ignition-dracut-bdf0a65.tar.gz) = 284f077df975efb6a3afef445a1db66d2c688c8d831b56790738d566e19c4f457ea27e99083099e1d2c066675e7ea2d39b23e714056d3c4892d53155322d1372
+SHA512 (ignition-d18bf90.tar.gz) = 8621fa1ae5ac74f6cb285f8e86efd094a705f3508ac5aeebbf5304c694d28ea823a542d1e44e56fbdc66ebe0b7ce49d521f2dd9cb4695cf485a0dfa533dcca1e
+SHA512 (ignition-dracut-e75fef0.tar.gz) = 43402225387ac10a70ed36b3fa813d380bc3cc17ba4b4ec16d4f0b50fed84145a0b30bf26610a64181d94934c671b2a85faf861fe5ee964a7e693f89a4677a5a